diff options
Diffstat (limited to 'src/lib/libcrypto/util/mkdef.pl')
-rw-r--r-- | src/lib/libcrypto/util/mkdef.pl | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/lib/libcrypto/util/mkdef.pl b/src/lib/libcrypto/util/mkdef.pl index cc41a1813e..ba453358cf 100644 --- a/src/lib/libcrypto/util/mkdef.pl +++ b/src/lib/libcrypto/util/mkdef.pl | |||
@@ -119,7 +119,7 @@ foreach (@ARGV, split(/ /, $options)) | |||
119 | elsif (/^no-rc4$/) { $no_rc4=1; } | 119 | elsif (/^no-rc4$/) { $no_rc4=1; } |
120 | elsif (/^no-rc5$/) { $no_rc5=1; } | 120 | elsif (/^no-rc5$/) { $no_rc5=1; } |
121 | elsif (/^no-idea$/) { $no_idea=1; } | 121 | elsif (/^no-idea$/) { $no_idea=1; } |
122 | elsif (/^no-des$/) { $no_des=1; } | 122 | elsif (/^no-des$/) { $no_des=1; $no_mdc2=1; } |
123 | elsif (/^no-bf$/) { $no_bf=1; } | 123 | elsif (/^no-bf$/) { $no_bf=1; } |
124 | elsif (/^no-cast$/) { $no_cast=1; } | 124 | elsif (/^no-cast$/) { $no_cast=1; } |
125 | elsif (/^no-md2$/) { $no_md2=1; } | 125 | elsif (/^no-md2$/) { $no_md2=1; } |
@@ -705,7 +705,8 @@ EOF | |||
705 | } else { | 705 | } else { |
706 | (my $n, my $i) = split /\\/, $nums{$s}; | 706 | (my $n, my $i) = split /\\/, $nums{$s}; |
707 | my %pf = (); | 707 | my %pf = (); |
708 | my @p = split(/,/, ($i =~ /^.*?:(.*?):/,$1)); | 708 | my @p = split(/,/, ($i =~ /^[^:]*:([^:]*):/,$1)); |
709 | my @a = split(/,/, ($i =~ /^[^:]*:[^:]*:[^:]*:([^:]*)/,$1)); | ||
709 | # @p_purged must contain hardware platforms only | 710 | # @p_purged must contain hardware platforms only |
710 | my @p_purged = (); | 711 | my @p_purged = (); |
711 | foreach $ptmp (@p) { | 712 | foreach $ptmp (@p) { |
@@ -727,7 +728,26 @@ EOF | |||
727 | || (!$negatives | 728 | || (!$negatives |
728 | && ($rsaref || !grep(/^RSAREF$/,@p))) | 729 | && ($rsaref || !grep(/^RSAREF$/,@p))) |
729 | || ($negatives | 730 | || ($negatives |
730 | && (!$rsaref || !grep(/^!RSAREF$/,@p))))) { | 731 | && (!$rsaref || !grep(/^!RSAREF$/,@p)))) |
732 | && (!@a || (!$no_rc2 || !grep(/^RC2$/,@a))) | ||
733 | && (!@a || (!$no_rc4 || !grep(/^RC4$/,@a))) | ||
734 | && (!@a || (!$no_rc5 || !grep(/^RC5$/,@a))) | ||
735 | && (!@a || (!$no_idea || !grep(/^IDEA$/,@a))) | ||
736 | && (!@a || (!$no_des || !grep(/^DES$/,@a))) | ||
737 | && (!@a || (!$no_bf || !grep(/^BF$/,@a))) | ||
738 | && (!@a || (!$no_cast || !grep(/^CAST$/,@a))) | ||
739 | && (!@a || (!$no_md2 || !grep(/^MD2$/,@a))) | ||
740 | && (!@a || (!$no_md4 || !grep(/^MD4$/,@a))) | ||
741 | && (!@a || (!$no_md5 || !grep(/^MD5$/,@a))) | ||
742 | && (!@a || (!$no_sha || !grep(/^SHA$/,@a))) | ||
743 | && (!@a || (!$no_ripemd || !grep(/^RIPEMD$/,@a))) | ||
744 | && (!@a || (!$no_mdc2 || !grep(/^MDC2$/,@a))) | ||
745 | && (!@a || (!$no_rsa || !grep(/^RSA$/,@a))) | ||
746 | && (!@a || (!$no_dsa || !grep(/^DSA$/,@a))) | ||
747 | && (!@a || (!$no_dh || !grep(/^DH$/,@a))) | ||
748 | && (!@a || (!$no_hmac || !grep(/^HMAC$/,@a))) | ||
749 | && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a))) | ||
750 | ) { | ||
731 | printf OUT " %s%-40s@%d\n",($W32)?"":"_",$s,$n; | 751 | printf OUT " %s%-40s@%d\n",($W32)?"":"_",$s,$n; |
732 | # } else { | 752 | # } else { |
733 | # print STDERR "DEBUG: \"$sym\" (@p):", | 753 | # print STDERR "DEBUG: \"$sym\" (@p):", |