More CryptoAPI engine code from stable branch.

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index fb01ca8972edafdd7deb8c6d165041f3f3a0ffe9..80edead3baa024420799009a6a8ce97b1b7d8bea 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -108,6 +108,9 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_GMP
        ENGINE_load_gmp();
 #endif
+#endif
+#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+       ENGINE_load_capi();
 #endif
        }
 

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index ed966a82c563244b7a6715566046c964d330e771..8dfc4561d1ca0c2ce3315eb235bbeccc33d8a950 100644 (file)
--- 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. */