mkdef.pl still needed better logic. Also, the semantics of the

platforms list is clarified (it's however not quite followed in the
RSAREF case...).

RSAREF is also checked now.

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 706073dd74e0906952bd143f9598e88d110cc6f7..5bc02355ff7762813ca7038959d9dbb451ad71ac 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -40,7 +40,14 @@
 #   symbol name replacements for platforms where the names are too long for the
 #   compiler or linker, or if the systems is case insensitive and there is a
 #   clash.  This script assumes those redefinitions are place in the file
-#   crypto/idhacks.h.
+#   crypto/symhacks.h.
+#   The semantics for the platforms list is a bit complicated.  The rule of
+#   thumb is that the list is exclusive, but it seems to mean different things.
+#   So, if the list is all negatives (like "!VMS,!WIN16"), the symbol exists
+#   on all platforms except those listed.  If the list is all positives (like
+#   "VMS,WIN16"), the symbol exists only on those platforms and nowhere else.
+#   The combination of positives and negatives will act as if the positives
+#   weren't there.
 # - "kind" is "FUNCTION" or "VARIABLE".  The meaning of that is obvious.
 # - "algorithms" is a comma-separated list of algorithm names.  This helps
 #   exclude symbols that are part of an algorithm that some user wants to
@@ -96,6 +103,8 @@ foreach (@ARGV, split(/ /, $options))
                $NT = 1;
        }
        $VMS=1 if $_ eq "VMS";
+       $rsaref=1 if $_ eq "rsaref";
+
        $do_ssl=1 if $_ eq "ssleay";
        $do_ssl=1 if $_ eq "ssl";
        $do_crypto=1 if $_ eq "libeay";
@@ -104,7 +113,6 @@ foreach (@ARGV, split(/ /, $options))
        $do_rewrite=1 if $_ eq "rewrite";
        $do_ctest=1 if $_ eq "ctest";
        $do_ctestall=1 if $_ eq "ctestall";
-       $rsaref=1 if $_ eq "rsaref";
        #$safe_stack_def=1 if $_ eq "-DDEBUG_SAFESTACK";
 
        if    (/^no-rc2$/)      { $no_rc2=1; }
@@ -692,15 +700,48 @@ EOF
                                        if(!$do_update);
                } else {
                        (my $n, my $i) = split /\\/, $nums{$s};
+                       my %pf = ();
                        my @p = split(/,/, ($i =~ /^.*?:(.*?):/,$1));
+                       # @p_purged must contain hardware platforms only
+                       my @p_purged = ();
+                       foreach $ptmp (@p) {
+                               next if $ptmp =~ /^!?RSAREF$/;
+                               push @p_purged, $ptmp;
+                       }
+                       my $negatives = !!grep(/^!/,@p);
                        # It is very important to check NT before W32
-                       if (($NT && (!@p || (grep(/^WINNT$/,@p)
-                                            || !grep(/^!WINNT$/,@p))))
-                           || ($W32 && (!@p || (grep(/^WIN32$/,@p)
-                                                || !grep(/^!WIN32$/,@p))))
-                           || ($W16 && (!@p || (grep(/^WIN16$/,@p)
-                                                || !grep(/^!WIN16$/,@p))))) {
+                       if ((($NT && (!@p_purged
+                                     || (!$negatives && grep(/^WINNT$/,@p))
+                                     || ($negatives && !grep(/^!WINNT$/,@p))))
+                            || ($W32 && (!@p_purged
+                                         || (!$negatives && grep(/^WIN32$/,@p))
+                                         || ($negatives && !grep(/^!WIN32$/,@p))))
+                            || ($W16 && (!@p_purged
+                                         || (!$negatives && grep(/^WIN16$/,@p))
+                                         || ($negatives && !grep(/^!WIN16$/,@p)))))
+                           && (!@p
+                               || (!$negatives
+                                   && ($rsaref || !grep(/^RSAREF$/,@p)))
+                               || ($negatives
+                                   && (!$rsaref || !grep(/^!RSAREF$/,@p))))) {
                                printf OUT "    %s%-40s@%d\n",($W32)?"":"_",$s,$n;
+#                      } else {
+#                              print STDERR "DEBUG: \"$sym\" (@p):",
+#                              " rsaref:", !!(!@p
+#                                             || (!$negatives
+#                                                 && ($rsaref || !grep(/^RSAREF$/,@p)))
+#                                             || ($negatives
+#                                                 && (!$rsaref || !grep(/^!RSAREF$/,@p))))?1:0,
+#                              " 16:", !!($W16 && (!@p_purged
+#                                                  || (!$negatives && grep(/^WIN16$/,@p))
+#                                                  || ($negatives && !grep(/^!WIN16$/,@p)))),
+#                              " 32:", !!($W32 && (!@p_purged
+#                                                  || (!$negatives && grep(/^WIN32$/,@p))
+#                                                  || ($negatives && !grep(/^!WIN32$/,@p)))),
+#                              " NT:", !!($NT && (!@p_purged
+#                                                 || (!$negatives && grep(/^WINNT$/,@p))
+#                                                 || ($negatives && !grep(/^!WINNT$/,@p)))),
+#                              "\n";
                        }
                }
        }