diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-07 21:40:52 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-01-08 14:35:04 -0500 |
| commit | 6ac11bd0b9252e4cf53cb0b914db98b401779c15 (patch) | |
| tree | a14e20ecab82a453c408f8da3b2f6ed313d97fcb /util/mkdef.pl | |
| parent | 8da94770f0a049497b1a52ee469cca1f4a13b1a7 (diff) | |
| download | openssl-new-6ac11bd0b9252e4cf53cb0b914db98b401779c15.tar.gz | |
Fix no CRYPTO_MDEBUG build (windows)
In order for mkdep to find #ifdef'd functions, they must be
wrapped (in the header file) with
#ifndef OPENSSL_NO_...
So do that for various CRYPTO_mem_debug... things.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'util/mkdef.pl')
| -rwxr-xr-x | util/mkdef.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index fd36a0d7da..9478f3081c 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -81,6 +81,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "LOCKING", # External "algorithms" "FP_API", "STDIO", "SOCK", "DGRAM", + "CRYPTO_MDEBUG", # Engines "STATIC_ENGINE", "ENGINE", "HW", "GMP", # X.509v3 Signed Certificate Timestamps @@ -135,7 +136,7 @@ my $no_fp_api; my $no_static_engine=1; my $no_deprecated; my $no_sct; my $no_rfc3779; my $no_psk; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ec2m; my $no_nistp_gcc; my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace; -my $no_unit_test; my $no_ssl3_method; my $no_ocb; +my $no_unit_test; my $no_ssl3_method; my $no_ocb; my $no_crypto_mdebug; my $zlib; @@ -237,6 +238,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-unit-test$/){ $no_unit_test=1; } elsif (/^no-deprecated$/) { $no_deprecated=1; } elsif (/^no-ocb/){ $no_ocb=1; } + elsif (/^no-crypto-mdebug/){ $no_crypto_mdebug=1; } } @@ -1221,6 +1223,7 @@ sub is_valid if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } if ($keyword eq "OCB" && $no_ocb) { return 0; } + if ($keyword eq "CRYPTO_MDEBUG" && $no_crypto_mdebug) { return 0; } # Nothing recognise as true return 1; |