Update VC-32.pl and load CryptoAPI engine in the right place.
authorDr. Stephen Henson <steve@openssl.org>
Sat, 31 May 2008 23:21:40 +0000 (23:21 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 31 May 2008 23:21:40 +0000 (23:21 +0000)
crypto/engine/eng_all.c
util/pl/VC-32.pl

index 80edead..a6f5499 100644 (file)
@@ -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
        }
 
index 23f8d19..7db1d51 100644 (file)
@@ -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.