summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-05-29 17:20:42 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-05-29 17:20:42 +0000
commita29669d78d211b7bdc9690735938c1eb11ef6feb (patch)
treef1c70609a78396ec66540d828484d1a58755dbf8 /util
parente5be1e16967f3333254d8f4635f91555dd164d61 (diff)
downloadopenssl-new-a29669d78d211b7bdc9690735938c1eb11ef6feb.tar.gz
Disable CryptoAPI engine compilation by default.
Diffstat (limited to 'util')
-rwxr-xr-xutil/mk1mf.pl2
-rw-r--r--util/pl/VC-32.pl1
2 files changed, 3 insertions, 0 deletions
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/;