Fix logic in mkdef.pl function is_valid.

Update symbols

diff --git a/util/libeay.num b/util/libeay.num
index 30beee2fb34bdc125d65e6087680d2047b946ba0..a0bb214124e2a09a7813edaa422d089ddb2cee0d 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2891,7 +2891,7 @@ BN_GF2m_mod_exp_arr                     3324      EXIST::FUNCTION:
 STORE_ATTR_INFO_modify_number           3325   EXIST::FUNCTION:
 X509_keyid_get0                         3326   EXIST::FUNCTION:
 EC_GROUP_new_by_nid                     3327   EXIST::FUNCTION:EC
-ENGINE_load_gmp                         3328   EXIST::FUNCTION:ENGINE,STATIC_ENGINE
+ENGINE_load_gmp                         3328   EXIST::FUNCTION:ENGINE,GMP,STATIC_ENGINE
 BN_GF2m_mod_mul_arr                     3329   EXIST::FUNCTION:
 STORE_list_public_key_endp              3330   EXIST::FUNCTION:
 o2i_ECPublicKey                         3331   EXIST::FUNCTION:EC
@@ -3300,3 +3300,4 @@ BIO_dump_cb                             3699      EXIST::FUNCTION:
 SHA256_Update                           3700   EXIST::FUNCTION:SHA,SHA256
 BN_GF2m_mod_inv_arr                     3701   EXIST::FUNCTION:
 ENGINE_unregister_ECDSA                 3702   EXIST::FUNCTION:ENGINE
+OPENSSL_ia32cap_loc                     3703   EXIST::FUNCTION:

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 6cbdf776833c5c9ca3de685474a9370067fd5b27..357adf4623cccd8066634b1f44ea56a0563200cd 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1032,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
@@ -1102,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;