Disable CryptoAPI engine compilation by default.

diff --git a/Configure b/Configure
index 1a9a59f969f36c9186a4fce2665e400fc13d8b45..b441a8a9ddaad2ffd7ad8ef15aafb901bece76bf 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -616,6 +616,7 @@ my $perl;
 
 my %disabled = ( # "what"         => "comment"
                  "camellia"       => "default",
+                 "capieng"        => "default",
                  "cms"            => "default",
                  "gmp"            => "default",
                  "mdc2"           => "default",

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 1ac5fd3a5077e307f34b838ccd37e66058f610de..2b129ff36b1dde5141a43d2cb677aee34ad41acf 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -221,6 +221,7 @@ $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
 $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
+$cflags.=" -DOPENSSL_NO_CAPIENG" if $no_capieng;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
 $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
 $cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
@@ -1017,6 +1018,7 @@ sub read_options
                "no-ssl3" => \$no_ssl3,
                "no-tlsext" => \$no_tlsext,
                "no-cms" => \$no_cms,
+               "no-capieng" => \$no_capieng,
                "no-err" => \$no_err,
                "no-sock" => \$no_sock,
                "no-krb5" => \$no_krb5,

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 9cb2ab7e991891c880c7848fa22dc2f0153cbd81..627613e5a8648627d174804d153f0b3d5f46c692 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -283,6 +283,7 @@ sub do_lib_rule
                        {
                        $ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
                        $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
+                       $ex.=' crypt32.lib';
                        $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
                        }
                $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;