From cda302d94fe7dd6357ff89aff3c9cf1dd8854324 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 22 Oct 2015 19:22:53 +0100 Subject: [PATCH] remove ECDH from mkdef.pl Reviewed-by: Richard Levitte --- util/mkdef.pl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/util/mkdef.pl b/util/mkdef.pl index 43b2c2b594..fe7356d198 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -67,7 +67,7 @@ my @known_ossl_platforms = ( "VMS", "WIN32", "WINNT", "OS2" ); my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", "SHA256", "SHA512", "RMD160", - "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M", + "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDSA", "EC2M", "HMAC", "AES", "CAMELLIA", "SEED", "GOST", "SCRYPT", # EC_NISTP_64_GCC_128 @@ -127,7 +127,7 @@ my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf; my $no_cast; my $no_whirlpool; my $no_camellia; my $no_seed; my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; my $no_rsa; my $no_dsa; my $no_dh; my $no_aes; my $no_scrypt; -my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; +my $no_ec; my $no_ecdsa; my $no_engine; my $no_hw; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_sct; my $no_rfc3779; my $no_psk; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ec2m; my $no_nistp_gcc; @@ -202,7 +202,6 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-dh$/) { $no_dh=1; } elsif (/^no-ec$/) { $no_ec=1; } elsif (/^no-ecdsa$/) { $no_ecdsa=1; } - elsif (/^no-ecdh$/) { $no_ecdh=1; } elsif (/^no-aes$/) { $no_aes=1; } elsif (/^no-camellia$/) { $no_camellia=1; } elsif (/^no-seed$/) { $no_seed=1; } @@ -295,7 +294,6 @@ $crypto.=" include/openssl/dsa.h" ; # unless $no_dsa; $crypto.=" include/openssl/dh.h" ; # unless $no_dh; $crypto.=" include/openssl/ec.h" ; # unless $no_ec; $crypto.=" include/openssl/ecdsa.h" ; # unless $no_ecdsa; -$crypto.=" include/openssl/ecdh.h" ; # unless $no_ecdh; $crypto.=" include/openssl/hmac.h" ; # unless $no_hmac; $crypto.=" include/openssl/cmac.h" ; @@ -1189,7 +1187,6 @@ sub is_valid if ($keyword eq "DH" && $no_dh) { return 0; } if ($keyword eq "EC" && $no_ec) { return 0; } if ($keyword eq "ECDSA" && $no_ecdsa) { return 0; } - if ($keyword eq "ECDH" && $no_ecdh) { return 0; } if ($keyword eq "AES" && $no_aes) { return 0; } if ($keyword eq "CAMELLIA" && $no_camellia) { return 0; } if ($keyword eq "SEED" && $no_seed) { return 0; } -- 2.25.1