diff options
| author | Matt Caswell <matt@openssl.org> | 2014-10-15 01:23:07 +0100 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2014-10-15 08:56:16 -0400 |
| commit | 3dd814ac4d0581af363068e83b5fa8d5271063d5 (patch) | |
| tree | beb2d6e3f6b57e11c0f178de840c596e60fc5943 /util/mkdef.pl | |
| parent | e659eff2c0ac6da05dd968a9354c9a69ca7f57b4 (diff) | |
| download | openssl-3dd814ac4d0581af363068e83b5fa8d5271063d5.tar.gz | |
Fix SRTP compile issues for windows
Related to CVE-2014-3513
This fix was developed by the OpenSSL Team
Reviewed-by: Tim Hudson <tjh@openssl.org>
Conflicts:
util/mkdef.pl
util/ssleay.num
Diffstat (limited to 'util/mkdef.pl')
| -rwxr-xr-x | util/mkdef.pl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 1b0181149d..0f42504f97 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -117,7 +117,9 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", # Hide SSL internals "SSL_INTERN", # SCTP - "SCTP", + "SCTP", + # SRTP + "SRTP", # SSL TRACE "SSL_TRACE", # Unit testing @@ -140,8 +142,8 @@ my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; -my $no_jpake; my $no_ssl2; my $no_ec2m; my $no_nextprotoneg; -my $no_srp; my $no_nistp_gcc; my $no_sctp; my $no_ssl_trace; +my $no_jpake; my $no_srp; my $no_ssl2; 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 $fips; @@ -242,6 +244,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-jpake$/) { $no_jpake=1; } elsif (/^no-srp$/) { $no_srp=1; } elsif (/^no-sctp$/) { $no_sctp=1; } + elsif (/^no-srtp$/) { $no_srtp=1; } elsif (/^no-unit-test$/){ $no_unit_test=1; } } @@ -1212,6 +1215,7 @@ sub is_valid if ($keyword eq "JPAKE" && $no_jpake) { return 0; } if ($keyword eq "SRP" && $no_srp) { return 0; } if ($keyword eq "SCTP" && $no_sctp) { return 0; } + 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; } |