Fixes for no-static-engine and Windows builds.

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index f29c167c06984a03fe0561a5165edf4097095f14..8a1b9c7c6ab32bdd7616277f4f4c85a4d31d1a4f 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -102,14 +102,14 @@ void ENGINE_load_builtin_engines(void)
 #if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
        ENGINE_load_gmp();
 #endif
+#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+       ENGINE_load_capi();
+#endif
 #endif
 #ifndef OPENSSL_NO_HW
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
        ENGINE_load_cryptodev();
 #endif
-#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
-       ENGINE_load_capi();
-#endif
 #endif
        }
 

diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index d4bc1efc794c123ad39febf0047b5f6b1968deaf..b4e0444fb810021773ba889584756dd99d993def 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -335,15 +335,15 @@ void ENGINE_load_gmp(void);
 void ENGINE_load_nuron(void);
 void ENGINE_load_sureware(void);
 void ENGINE_load_ubsec(void);
-#endif
-void ENGINE_load_cryptodev(void);
-void ENGINE_load_padlock(void);
-void ENGINE_load_builtin_engines(void);
 #ifdef OPENSSL_SYS_WIN32
 #ifndef OPENSSL_NO_CAPIENG
 void ENGINE_load_capi(void);
 #endif
 #endif
+#endif
+void ENGINE_load_cryptodev(void);
+void ENGINE_load_padlock(void);
+void ENGINE_load_builtin_engines(void);
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
  * "registry" handling. */

diff --git a/util/libeay.num b/util/libeay.num
index 46d3b835c553084a0a43f5ddda186467b3a0433a..93a64ca3a6628a64ff3a8b3e0517db2055a2718b 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3658,7 +3658,7 @@ ENGINE_set_ld_ssl_clnt_cert_fn          4044      EXIST:VMS:FUNCTION:ENGINE
 ENGINE_get_ssl_client_cert_function     4045   EXIST:!VMS:FUNCTION:ENGINE
 ENGINE_get_ssl_client_cert_fn           4045   EXIST:VMS:FUNCTION:ENGINE
 ENGINE_load_ssl_client_cert             4046   EXIST::FUNCTION:ENGINE
-ENGINE_load_capi                        4047   EXIST:WIN32:FUNCTION:CAPIENG,ENGINE
+ENGINE_load_capi                        4047   EXIST:WIN32:FUNCTION:CAPIENG,ENGINE,STATIC_ENGINE
 OPENSSL_isservice                       4048   EXIST::FUNCTION:
 FIPS_dsa_sig_decode                     4049   EXIST:OPENSSL_FIPS:FUNCTION:DSA
 EVP_CIPHER_CTX_clear_flags              4050   EXIST::FUNCTION:

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 5001557e7d0bd9bb7081841e8b28fc0cee50671b..2db008cc82304c1a8766cbaca115cb47ba2e1694 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -337,7 +337,7 @@ sub do_lib_rule
        else
                {
                my $ex = "";            
-               if ($target =~ /O_SSL/)
+               if ($target !~ /O_CRYPTO/)
                        {
                        $ex .= " \$(L_CRYPTO)";
                        #$ex .= " \$(L_FIPS)" if $fipsdso;