diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-11-21 22:35:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-11-21 22:35:35 +0000 |
| commit | 9c115a4acc78eee6d684f956a4eed43abf186ed7 (patch) | |
| tree | 94e3ea45eb6d4990e8c6e377e509a9abcb81d4f0 | |
| parent | 43716567f593080582d5ed131bde03d8bd7fc80e (diff) | |
recognise NEXTPROTONEG
| -rwxr-xr-x | util/mkdef.pl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 9f321ad98c..70bb7099f1 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -109,6 +109,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "SSL2", # JPAKE "JPAKE", + # NEXTPROTONEG + "NEXTPROTONEG", # Deprecated functions "DEPRECATED", # Hide SSL internals @@ -132,6 +134,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 $fips; @@ -224,6 +227,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-cms$/) { $no_cms=1; } elsif (/^no-ec2m$/) { $no_ec2m=1; } elsif (/^no-ec_nistp_64_gcc_128$/) { $no_nistp_gcc=1; } + elsif (/^no-nextprotoneg$/) { $no_nextprotoneg=1; } elsif (/^no-ssl2$/) { $no_ssl2=1; } elsif (/^no-capieng$/) { $no_capieng=1; } elsif (/^no-jpake$/) { $no_jpake=1; } @@ -1188,6 +1192,7 @@ sub is_valid if ($keyword eq "PSK" && $no_psk) { return 0; } if ($keyword eq "CMS" && $no_cms) { return 0; } if ($keyword eq "EC2M" && $no_ec2m) { return 0; } + if ($keyword eq "NEXTPROTONEG" && $no_nextprotoneg) { return 0; } if ($keyword eq "EC_NISTP_64_GCC_128" && $no_nistp_gcc) { return 0; } if ($keyword eq "SSL2" && $no_ssl2) { return 0; } |