From ec645d90174b354854cacb69907c429fef7e610b Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 5 Dec 2005 00:53:10 +0000 Subject: [PATCH] Make mk1mf.pl and friends recognize Whirlpool. --- util/libeay.num | 7 ++++++- util/mk1mf.pl | 3 +++ util/mkdef.pl | 8 ++++++-- util/mkfiles.pl | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/util/libeay.num b/util/libeay.num index 7bf14a255b..66c43f62de 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -3400,7 +3400,7 @@ i2b_PublicKey_bio 3800 EXIST::FUNCTION: b2i_PrivateKey 3801 EXIST::FUNCTION: b2i_PrivateKey_bio 3802 EXIST::FUNCTION: PKCS7_print_ctx 3803 EXIST::FUNCTION: -EVP_whirlpool 3804 EXIST::FUNCTION: +EVP_whirlpool 3804 EXIST::FUNCTION:WHIRLPOOL ASN1_PCTX_set_flags 3805 EXIST::FUNCTION: NETSCAPE_X509_it 3806 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: NETSCAPE_X509_it 3806 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -3416,3 +3416,8 @@ ASN1_PCTX_get_str_flags 3814 EXIST::FUNCTION: ASN1_PCTX_free 3815 EXIST::FUNCTION: DSO_pathbyaddr 3816 EXIST::FUNCTION: ASN1_PCTX_set_cert_flags 3817 EXIST::FUNCTION: +WHIRLPOOL_Init 3818 EXIST::FUNCTION:WHIRLPOOL +WHIRLPOOL 3819 EXIST::FUNCTION:WHIRLPOOL +WHIRLPOOL_BitUpdate 3820 EXIST::FUNCTION:WHIRLPOOL +WHIRLPOOL_Final 3821 EXIST::FUNCTION:WHIRLPOOL +WHIRLPOOL_Update 3822 EXIST::FUNCTION:WHIRLPOOL diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 65d7d9cca2..8b3d929e62 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -211,6 +211,7 @@ $cflags.=" -DOPENSSL_NO_DES" if $no_des; $cflags.=" -DOPENSSL_NO_RSA" if $no_rsa; $cflags.=" -DOPENSSL_NO_DSA" if $no_dsa; $cflags.=" -DOPENSSL_NO_DH" if $no_dh; +$cflags.=" -DOPENSSL_NO_WHIRLPOOL" if $no_whirlpool; $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock; $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2; $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3; @@ -727,6 +728,7 @@ sub var_add return("") if $no_sock && $dir =~ /\/proxy/; return("") if $no_bf && $dir =~ /\/bf/; return("") if $no_cast && $dir =~ /\/cast/; + return("") if $no_whirlpool && $dir =~ /\/whrlpool/; $val =~ s/^\s*(.*)\s*$/$1/; @a=split(/\s+/,$val); @@ -961,6 +963,7 @@ sub read_options "no-sha1" => \$no_sha1, "no-ripemd" => \$no_ripemd, "no-mdc2" => \$no_mdc2, + "no-whirlpool" => \$no_whirlpool, "no-patents" => [\$no_rc2, \$no_rc4, \$no_rc5, \$no_idea, \$no_rsa], "no-rsa" => \$no_rsa, diff --git a/util/mkdef.pl b/util/mkdef.pl index 7ec95ad658..3eac544262 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -84,7 +84,8 @@ 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", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "HMAC", "AES", + "MDC2", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", + "HMAC", "AES", "WHIRLPOOL", # Envelope "algorithms" "EVP", "X509", "ASN1_TYPEDEFS", # Helper "algorithms" @@ -108,7 +109,7 @@ close(IN); # defined with ifndef(NO_XXX) are not included in the .def file, and everything # in directory xxx is ignored. my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf; -my $no_cast; +my $no_cast; my $no_whirlpool; 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_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; @@ -161,6 +162,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-des$/) { $no_des=1; $no_mdc2=1; } elsif (/^no-bf$/) { $no_bf=1; } elsif (/^no-cast$/) { $no_cast=1; } + elsif (/^no-whirlpool$/) { $no_whirlpool=1; } elsif (/^no-md2$/) { $no_md2=1; } elsif (/^no-md4$/) { $no_md4=1; } elsif (/^no-md5$/) { $no_md5=1; } @@ -233,6 +235,7 @@ $crypto.=" crypto/rc5/rc5.h" ; # unless $no_rc5; $crypto.=" crypto/rc2/rc2.h" ; # unless $no_rc2; $crypto.=" crypto/bf/blowfish.h" ; # unless $no_bf; $crypto.=" crypto/cast/cast.h" ; # unless $no_cast; +$crypto.=" crypto/whrlpool/whrlpool.h" ; $crypto.=" crypto/md2/md2.h" ; # unless $no_md2; $crypto.=" crypto/md4/md4.h" ; # unless $no_md4; $crypto.=" crypto/md5/md5.h" ; # unless $no_md5; @@ -1078,6 +1081,7 @@ sub is_valid if ($keyword eq "SHA" && $no_sha) { return 0; } if ($keyword eq "RIPEMD" && $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; } if ($keyword eq "DSA" && $no_dsa) { return 0; } if ($keyword eq "DH" && $no_dh) { return 0; } diff --git a/util/mkfiles.pl b/util/mkfiles.pl index cb0e282fa8..cb537c347f 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -55,6 +55,7 @@ my @dirs = ( "crypto/krb5", "crypto/store", "crypto/pqueue", +"crypto/whrlpool", "ssl", "apps", "engines", -- GitLab