More CryptoAPI engine code from stable branch.

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
 	}
 

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