let mkdef.pl know about OPENSSL_NO_DGRAM

[openssl.git] / util / mkdef.pl

diff --git a/util/mkdef.pl b/util/mkdef.pl
index e6064baf6cb374e4ec23e9c27c3e2179ae1af073..d02636163232e4a84ba27406cef38d1c795d4af7 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -91,7 +91,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR",
                         "LOCKING",
                         # External "algorithms"
-                        "FP_API", "STDIO", "SOCK", "KRB5",
+                        "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM",
                         # Engines
                         "STATIC_ENGINE", "ENGINE", "HW", "GMP",
                         # Deprecated functions
@@ -432,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 = '';
@@ -1028,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
@@ -1098,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;