Remove OPENSSL_NO_HMAC

[openssl.git] / util / mkdef.pl

diff --git a/util/mkdef.pl b/util/mkdef.pl
index b67d14be57c24ae70efa750baec54b5a573b0558..3ae0a9070313522068075b5bb8aa1144629a05d9 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -83,7 +83,7 @@ my @known_platforms = ( "__FreeBSD__", "PERL5",
 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", "RIPEMD",
+                        "SHA256", "SHA512", "RMD160",
                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M",
                         "HMAC", "AES", "CAMELLIA", "SEED", "GOST",
                         # EC_NISTP_64_GCC_128
@@ -111,8 +111,6 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "NEXTPROTONEG",
                         # Deprecated functions
                         "DEPRECATED",
-                        # Hide SSL internals
-                        "SSL_INTERN",
                         # SCTP
                         "SCTP",
                         # SRTP
@@ -137,10 +135,10 @@ close(IN);
 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_hmac=0; my $no_aes; my $no_krb5;
+my $no_rsa; my $no_dsa; my $no_dh; 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 my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
+my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
 my $no_jpake; my $no_srp; 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 $no_ssl3_method; my $no_ocb;
@@ -214,7 +212,6 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-ec$/)       { $no_ec=1; }
        elsif (/^no-ecdsa$/)    { $no_ecdsa=1; }
        elsif (/^no-ecdh$/)     { $no_ecdh=1; }
-       elsif (/^no-hmac$/)     { $no_hmac=1; }
        elsif (/^no-aes$/)      { $no_aes=1; }
        elsif (/^no-camellia$/) { $no_camellia=1; }
        elsif (/^no-seed$/)     { $no_seed=1; }
@@ -283,7 +280,7 @@ my $crypto ="crypto/crypto.h";
 $crypto.=" crypto/cryptlib.h";
 $crypto.=" crypto/o_dir.h";
 $crypto.=" crypto/o_str.h";
-$crypto.=" crypto/des/des.h crypto/des/des_old.h" ; # unless $no_des;
+$crypto.=" crypto/des/des.h" ; # unless $no_des;
 $crypto.=" crypto/idea/idea.h" ; # unless $no_idea;
 $crypto.=" crypto/rc4/rc4.h" ; # unless $no_rc4;
 $crypto.=" crypto/rc5/rc5.h" ; # unless $no_rc5;
@@ -974,7 +971,7 @@ sub do_defs
                        $a .= ",RC2" if($s =~ /EVP_rc2/);
                        $a .= ",RC4" if($s =~ /EVP_rc4/);
                        $a .= ",RC5" if($s =~ /EVP_rc5/);
-                       $a .= ",RIPEMD" if($s =~ /EVP_ripemd/);
+                       $a .= ",RMD160" if($s =~ /EVP_ripemd/);
                        $a .= ",RSA" if($s =~ /EVP_(Open|Seal)(Final|Init)/);
                        $a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/);
                        $a .= ",RSA" if($s =~ /RSAPrivateKey/);
@@ -1181,7 +1178,7 @@ sub is_valid
                        if ($keyword eq "MD4" && $no_md4) { return 0; }
                        if ($keyword eq "MD5" && $no_md5) { return 0; }
                        if ($keyword eq "SHA" && $no_sha) { return 0; }
-                       if ($keyword eq "RIPEMD" && $no_ripemd) { return 0; }
+                       if ($keyword eq "RMD160" && $no_ripemd) { return 0; }
                        if ($keyword eq "MDC2" && $no_mdc2) { return 0; }
                        if ($keyword eq "WHIRLPOOL" && $no_whirlpool) { return 0; }
                        if ($keyword eq "RSA" && $no_rsa) { return 0; }
@@ -1190,7 +1187,6 @@ sub is_valid
                        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 "HMAC" && $no_hmac) { 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; }