diff options
| author | steve <steve> | 2011-02-12 17:38:40 +0000 |
|---|---|---|
| committer | steve <steve> | 2011-02-12 17:38:40 +0000 |
| commit | c7693b7ffe67947e1dbf6b3a4d4b998cfabbac4b (patch) | |
| tree | c7ee9cd0ddb0ef7ee328a89d368780ae40f7a982 /util/mkdef.pl | |
| parent | 7bbd54126df8fe153c24067d13f039b203906cfd (diff) | |
| download | openssl-c7693b7ffe67947e1dbf6b3a4d4b998cfabbac4b.tar.gz | |
Make no-ec2m work on Win32 build. Add nexprotoneg support too.
Diffstat (limited to 'util/mkdef.pl')
| -rwxr-xr-x | util/mkdef.pl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 681c2bb77..3ccd542f6 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -84,7 +84,7 @@ my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" ); my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", "SHA256", "SHA512", "RIPEMD", - "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", + "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M", "HMAC", "AES", "CAMELLIA", "SEED", "GOST", # Envelope "algorithms" "EVP", "X509", "ASN1_TYPEDEFS", @@ -107,6 +107,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "SSL2", # JPAKE "JPAKE", + # NEXTPROTONEG + "NEXTPROTONEG", # Deprecated functions "DEPRECATED" ); @@ -127,7 +129,7 @@ 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_jpake; my $no_ssl2; my $no_ec2m; my $no_nextprotoneg; my $fips; @@ -218,6 +220,8 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-rfc3779$/) { $no_rfc3779=1; } elsif (/^no-tlsext$/) { $no_tlsext=1; } elsif (/^no-cms$/) { $no_cms=1; } + elsif (/^no-ec2m$/) { $no_ec2m=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; } @@ -1171,6 +1175,8 @@ sub is_valid if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; } 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 "SSL2" && $no_ssl2) { return 0; } if ($keyword eq "CAPIENG" && $no_capieng) { return 0; } if ($keyword eq "JPAKE" && $no_jpake) { return 0; } |