aboutsummaryrefslogtreecommitdiff
path: root/openssl/util/mkdef.pl
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2014-10-18 19:59:47 -0400
committerMike DePaulo <mikedep333@gmail.com>2014-10-18 20:57:02 -0400
commit8aa7b05b29941b07940857ff6f60bcc60eaa59a9 (patch)
treeacf3d988cfbd1977723f93285bda5152d096b92e /openssl/util/mkdef.pl
parentd2d01e39531d9fb823b2271244c324aad0a6575d (diff)
downloadvcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.gz
vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.bz2
vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.zip
Update openssl to version openssl-1.0.1j
Conflicts: openssl/Makefile openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/util/mkdef.pl')
-rw-r--r--openssl/util/mkdef.pl6
1 files changed, 5 insertions, 1 deletions
diff --git a/openssl/util/mkdef.pl b/openssl/util/mkdef.pl
index 79d4de896..1eaa7b8ac 100644
--- a/openssl/util/mkdef.pl
+++ b/openssl/util/mkdef.pl
@@ -117,6 +117,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"SSL_INTERN",
# SCTP
"SCTP",
+ # SRTP
+ "SRTP",
# Unit testing
"UNIT_TEST");
@@ -138,7 +140,7 @@ 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_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc;
-my $no_nextprotoneg; my $no_sctp;
+my $no_nextprotoneg; my $no_sctp; my $no_srtp;
my $no_unit_test;
my $fips;
@@ -238,6 +240,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; }
}
@@ -1209,6 +1212,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; }