summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-05-31 22:53:16 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-05-31 22:53:16 +0000
commit90b96776cdf064bc4ac5831e81fc5192b10d303e (patch)
tree894e4d21b076f5c6e9611b518a75d47d8453ba23 /crypto/engine
parent408f90659241feb18d15e93ee7e20c51a2781179 (diff)
More CryptoAPI engine code from stable branch.
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_all.c3
-rw-r--r--crypto/engine/engine.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index fb01ca8972..80edead3ba 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -109,6 +109,9 @@ void ENGINE_load_builtin_engines(void)
ENGINE_load_gmp();
#endif
#endif
+#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+ ENGINE_load_capi();
+#endif
}
#if defined(__OpenBSD__) || defined(__FreeBSD__)
diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index ed966a82c5..8dfc4561d1 100644
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -340,6 +340,9 @@ void ENGINE_load_gost(void);
#endif
void ENGINE_load_cryptodev(void);
void ENGINE_load_builtin_engines(void);
+#ifndef OPENSSL_NO_CAPIENG
+void ENGINE_load_capi(void);
+#endif
/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
* "registry" handling. */