Fix logic in mkdef.pl function is_valid.

[openssl.git] / util / mkdef.pl

diff --git a/util/mkdef.pl b/util/mkdef.pl
index e2a83c9fc7351b0b6cdf0948bdab7f8991eb2a2e..357adf4623cccd8066634b1f44ea56a0563200cd 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -93,7 +93,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         # External "algorithms"
                         "FP_API", "STDIO", "SOCK", "KRB5",
                         # Engines
-                        "STATIC_ENGINE", "ENGINE", "HW",
+                        "STATIC_ENGINE", "ENGINE", "HW", "GMP",
                         # Deprecated functions
                         "DEPRECATED" );
 
@@ -112,7 +112,8 @@ my $no_cast;
 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;
-my $no_fp_api; my $no_static_engine; my $no_deprecated;
+my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated;
+
 
 foreach (@ARGV, split(/ /, $options))
        {
@@ -184,6 +185,7 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-krb5$/)     { $no_krb5=1; }
        elsif (/^no-engine$/)   { $no_engine=1; }
        elsif (/^no-hw$/)       { $no_hw=1; }
+       elsif (/^no-gmp$/)      { $no_gmp=1; }
        }
 
 
@@ -430,7 +432,11 @@ sub do_defs
 
                print STDERR "DEBUG: parsing ----------\n" if $debug;
                while(<IN>) {
-                       last if (/\/\* Error codes for the \w+ functions\. \*\//);
+                       if (/\/\* Error codes for the \w+ functions\. \*\//)
+                               {
+                               undef @tag;
+                               last;
+                               }
                        if ($line ne '') {
                                $_ = $line . $_;
                                $line = '';
@@ -1026,7 +1032,7 @@ sub is_valid
 {
        my ($keywords_txt,$platforms) = @_;
        my (@keywords) = split /,/,$keywords_txt;
-       my ($falsesum, $truesum) = (0, !grep(/^[^!]/,@keywords));
+       my ($falsesum, $truesum) = (0, 1);
 
        # Param: one keyword
        sub recognise
@@ -1084,6 +1090,7 @@ sub is_valid
                        if ($keyword eq "HW" && $no_hw) { return 0; }
                        if ($keyword eq "FP_API" && $no_fp_api) { return 0; }
                        if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
+                       if ($keyword eq "GMP" && $no_gmp) { return 0; }
                        if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
 
                        # Nothing recognise as true
@@ -1095,7 +1102,7 @@ sub is_valid
                if ($k =~ /^!(.*)$/) {
                        $falsesum += &recognise($1,$platforms);
                } else {
-                       $truesum += &recognise($k,$platforms);
+                       $truesum *= &recognise($k,$platforms);
                }
        }
        print STDERR "DEBUG: [",$#keywords,",",$#keywords < 0,"] is_valid($keywords_txt) => (\!$falsesum) && $truesum = ",(!$falsesum) && $truesum,"\n" if $debug;