Update VC-32.pl and load CryptoAPI engine in the right place.

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 80edead3baa024420799009a6a8ce97b1b7d8bea..a6f5499340a93f12d0ac5c2fe83444d61e72545f 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -108,9 +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
 #endif
        }
 

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 23f8d190debe4e7aed9d107484841ffa82c327f5..7db1d51a8f5e5478ef30752447fd08828ff7e636 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -154,7 +154,7 @@ if ($FLAVOR =~ /CE/)
        }
 else
        {
-       $ex_libs.=' gdi32.lib advapi32.lib user32.lib';
+       $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
        $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
        # WIN32 UNICODE build gets linked with unicows.lib for
        # backward compatibility with Win9x.