diff options
| author | Matt Caswell <matt@openssl.org> | 2014-12-08 14:19:26 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-28 10:39:15 +0000 |
| commit | dc0e9a35fa89c262833d6b498108acc58a70bdcb (patch) | |
| tree | 5806aa2129b89672b3f637f02ca5b8701f714d5d /util/mkdef.pl | |
| parent | 488ede07bd9d2a2d3f63851eb28204c9ee998cf9 (diff) | |
| download | openssl-dc0e9a35fa89c262833d6b498108acc58a70bdcb.tar.gz | |
Fix no-ocb for Windows
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'util/mkdef.pl')
| -rwxr-xr-x | util/mkdef.pl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 1dbd555797..b67d14be57 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -120,7 +120,9 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", # SSL TRACE "SSL_TRACE", # Unit testing - "UNIT_TEST"); + "UNIT_TEST", + # OCB mode + "OCB"); my $options=""; open(IN,"<Makefile") || die "unable to open Makefile!\n"; @@ -141,7 +143,7 @@ my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my my $no_psk; my $no_tlsext; 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_unit_test; my $no_ssl3_method; my $no_ocb; my $fips; @@ -243,6 +245,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-srtp$/) { $no_srtp=1; } elsif (/^no-unit-test$/){ $no_unit_test=1; } elsif (/^no-deprecated$/) { $no_deprecated=1; } + elsif (/^no-ocb/){ $no_ocb=1; } } @@ -1221,6 +1224,7 @@ sub is_valid if ($keyword eq "SRTP" && $no_srtp) { return 0; } 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; } # Nothing recognise as true return 1; |