remove unused PREDECLARE

[openssl.git] / util / mkdef.pl

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 26cf3f4b45d102cd396b205afef5a2660eb52b6a..877ea16a5d5052937c91c79e784c51c9cd7a4d26 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -63,8 +63,8 @@ my $linux=0;
 my $safe_stack_def = 0;
 
 my @known_platforms = ( "__FreeBSD__", "PERL5",
-                       "EXPORT_VAR_AS_FUNCTION", "ZLIB",
-                       "OPENSSL_FIPS", "OPENSSL_FIPSCAPABLE" );
+                       "EXPORT_VAR_AS_FUNCTION", "ZLIB"
+                       );
 my @known_ossl_platforms = ( "VMS", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
@@ -137,8 +137,6 @@ my $no_jpake; my $no_srp; my $no_ec2m; my $no_nistp_gcc;
 my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace;
 my $no_unit_test; my $no_ssl3_method; my $no_ocb;
 
-my $fips;
-
 my $zlib;
 
 
@@ -164,7 +162,6 @@ foreach (@ARGV, split(/ /, $options))
        }
        $VMS=1 if $_ eq "VMS";
        $OS2=1 if $_ eq "OS2";
-       $fips=1 if /^fips/;
        if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic"
                         || $_ eq "enable-zlib-dynamic") {
                $zlib = 1;
@@ -1110,9 +1107,9 @@ sub maybe_add_info {
                (my $s, my $i) = split /\\/, $sym;
                if (defined($nums{$s})) {
                        $i =~ s/^(.*?:.*?:\w+)(\(\w+\))?/$1/;
-                       (my $n, my $dummy) = split /\\/, $nums{$s};
+                       (my $n, my $vers, my $dummy) = split /\\/, $nums{$s};
                        if (!defined($dummy) || $i ne $dummy) {
-                               $nums{$s} = $n."\\".$i;
+                               $nums{$s} = $n."\\".$vers."\\".$i;
                                $new_info++;
                                print STDERR "DEBUG: maybe_add_info for $s: \"$dummy\" => \"$i\"\n" if $debug;
                        }
@@ -1122,7 +1119,7 @@ sub maybe_add_info {
 
        my @s=sort { &parse_number($nums{$a},"n") <=> &parse_number($nums{$b},"n") } keys %nums;
        foreach $sym (@s) {
-               (my $n, my $i) = split /\\/, $nums{$sym};
+               (my $n, my $vers, my $i) = split /\\/, $nums{$sym};
                if (!defined($syms{$sym}) && $i !~ /^NOEXIST:/) {
                        $new_info++;
                        print STDERR "DEBUG: maybe_add_info for $sym: -> undefined\n" if $debug;
@@ -1165,12 +1162,6 @@ sub is_valid
                        if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32)) {
                                return 1;
                        }
-                       if ($keyword eq "OPENSSL_FIPSCAPABLE") {
-                               return 0;
-                       }
-                       if ($keyword eq "OPENSSL_FIPS" && $fips) {
-                               return 1;
-                       }
                        if ($keyword eq "ZLIB" && $zlib) { return 1; }
                        return 0;
                } else {
@@ -1273,7 +1264,7 @@ sub print_test_file
                        }
                        $prev = $s2;    # To warn about duplicates...
 
-                       ($nn,$ni)=($nums{$s2} =~ /^(.*?)\\(.*)$/);
+                       (my $nn, my $vers, my $ni) = split /\\/, $nums{$s2};
                        if ($v) {
                                print OUT "\textern int $s2; /* type unknown */ /* $nn $ni */\n";
                        } else {
@@ -1474,7 +1465,7 @@ sub load_numbers
 sub parse_number
 {
        (my $str, my $what) = @_;
-       (my $n, my $i) = split(/\\/,$str);
+       (my $n, my $v, my $i) = split(/\\/,$str);
        if ($what eq "n") {
                return $n;
        } else {
@@ -1510,7 +1501,7 @@ sub rewrite_numbers
            || $a cmp $b
        } keys %nums;
        foreach $sym (@s) {
-               (my $n, my $i) = split /\\/, $nums{$sym};
+               (my $n, my $vers, my $i) = split /\\/, $nums{$sym};
                next if defined($i) && $i =~ /^.*?:.*?:\w+\(\w+\)/;
                next if defined($rsyms{$sym});
                print STDERR "DEBUG: rewrite_numbers for sym = ",$sym,": i = ",$i,", n = ",$n,", rsym{sym} = ",$rsyms{$sym},"syms{sym} = ",$syms{$sym},"\n" if $debug;
@@ -1518,12 +1509,12 @@ sub rewrite_numbers
                        if !defined($i) || $i eq "" || !defined($syms{$sym});
                my $s2 = $sym;
                $s2 =~ s/\{[0-9]+\}$//;
-               printf OUT "%s%-39s %d\t%s\n","",$s2,$n,$i;
+               printf OUT "%s%-39s %d\t%s\t%s\n","",$s2,$n,$vers,$i;
                if (exists $r{$sym}) {
                        (my $s, $i) = split /\\/,$r{$sym};
                        my $s2 = $s;
                        $s2 =~ s/\{[0-9]+\}$//;
-                       printf OUT "%s%-39s %d\t%s\n","",$s2,$n,$i;
+                       printf OUT "%s%-39s %d\t%s\t%s\n","",$s2,$n,$vers,$i;
                }
        }
 }
@@ -1532,6 +1523,10 @@ sub update_numbers
 {
        (*OUT,$name,*nums,my $start_num, my @symbols)=@_;
        my $new_syms = 0;
+       my $basevers;
+       my $vers;
+
+       ($basevers, $vers) = get_openssl_version();
 
        print STDERR "Updating $name numbers\n";
 
@@ -1551,16 +1546,15 @@ sub update_numbers
                next if defined($rsyms{$sym});
                die "ERROR: Symbol $sym had no info attached to it."
                    if $i eq "";
-               next if $i =~ /OPENSSL_FIPSCAPABLE/;
                if (!exists $nums{$s}) {
                        $new_syms++;
                        my $s2 = $s;
                        $s2 =~ s/\{[0-9]+\}$//;
-                       printf OUT "%s%-39s %d\t%s\n","",$s2, ++$start_num,$i;
+                       printf OUT "%s%-39s %d\t%s\t%s\n","",$s2, ++$start_num,$vers,$i;
                        if (exists $r{$s}) {
                                ($s, $i) = split /\\/,$r{$s};
                                $s =~ s/\{[0-9]+\}$//;
-                               printf OUT "%s%-39s %d\t%s\n","",$s, $start_num,$i;
+                               printf OUT "%s%-39s %d\t%s\t%s\n","",$s, $start_num,$vers,$i;
                        }
                }
        }