From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 29 May 2008 17:20:42 +0000 (+0000)
Subject: Disable CryptoAPI engine compilation by default.
X-Git-Tag: OpenSSL_0_9_8i~85
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a29669d78d211b7bdc9690735938c1eb11ef6feb;p=oweals%2Fopenssl.git

Disable CryptoAPI engine compilation by default.
---

diff --git a/Configure b/Configure
index 1a9a59f969..b441a8a9dd 100755
--- 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 1ac5fd3a50..2b129ff36b 100755
--- 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 9cb2ab7e99..627613e5a8 100644
--- 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/;