summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-11-21 15:47:19 +0000
committerDr. Stephen Henson <steve@openssl.org>2013-11-21 15:49:34 +0000
commitb70e4d3e904e30796efaed77ac149e4b9e945826 (patch)
tree017befcaac27368449f87ca282a4ebdb516ad6bf /util
parentd9519a4032c082ff6805ab2de70a40034aad3894 (diff)
Fixes for no-static-engine and Windows builds.
Diffstat (limited to 'util')
-rwxr-xr-xutil/libeay.num2
-rw-r--r--util/pl/VC-32.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/util/libeay.num b/util/libeay.num
index 46d3b835c5..93a64ca3a6 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3658,7 +3658,7 @@ ENGINE_set_ld_ssl_clnt_cert_fn 4044 EXIST:VMS:FUNCTION:ENGINE
ENGINE_get_ssl_client_cert_function 4045 EXIST:!VMS:FUNCTION:ENGINE
ENGINE_get_ssl_client_cert_fn 4045 EXIST:VMS:FUNCTION:ENGINE
ENGINE_load_ssl_client_cert 4046 EXIST::FUNCTION:ENGINE
-ENGINE_load_capi 4047 EXIST:WIN32:FUNCTION:CAPIENG,ENGINE
+ENGINE_load_capi 4047 EXIST:WIN32:FUNCTION:CAPIENG,ENGINE,STATIC_ENGINE
OPENSSL_isservice 4048 EXIST::FUNCTION:
FIPS_dsa_sig_decode 4049 EXIST:OPENSSL_FIPS:FUNCTION:DSA
EVP_CIPHER_CTX_clear_flags 4050 EXIST::FUNCTION:
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 5001557e7d..2db008cc82 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -337,7 +337,7 @@ sub do_lib_rule
else
{
my $ex = "";
- if ($target =~ /O_SSL/)
+ if ($target !~ /O_CRYPTO/)
{
$ex .= " \$(L_CRYPTO)";
#$ex .= " \$(L_FIPS)" if $fipsdso;