From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 31 May 2008 22:53:16 +0000 (+0000)
Subject: More CryptoAPI engine code from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~370
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=90b96776cdf064bc4ac5831e81fc5192b10d303e;hp=408f90659241feb18d15e93ee7e20c51a2781179

More CryptoAPI engine code from stable branch.
---

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
@@ -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 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. */