Remove some #if 0 code in ssl, crypto/bio

[openssl.git] / util / mkdef.pl

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 19bbfee7ccb11a45c4ec3fad1367cbce8809be56..d82c849290dea4ecc89146078ae4303aef635521 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -24,7 +24,7 @@
 #      existence:platform:kind:algorithms
 #
 # - "existence" can be "EXIST" or "NOEXIST" depending on if the symbol is
-#   found somewhere in the source, 
+#   found somewhere in the source,
 # - "platforms" is empty if it exists on all platforms, otherwise it contains
 #   comma-separated list of the platform, just as they are if the symbol exists
 #   for those platforms, or prepended with a "!" if not.  This helps resolve
@@ -73,15 +73,16 @@ my $linux=0;
 my $safe_stack_def = 0;
 
 my @known_platforms = ( "__FreeBSD__", "PERL5",
-                       "EXPORT_VAR_AS_FUNCTION", "ZLIB"
+                       "EXPORT_VAR_AS_FUNCTION", "ZLIB", "_WIN32"
                        );
 my @known_ossl_platforms = ( "VMS", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
                         "SHA256", "SHA512", "RMD160",
                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "EC2M",
-                        "HMAC", "AES", "CAMELLIA", "SEED", "GOST",
+                        "HMAC", "AES", "CAMELLIA", "SEED", "GOST", "ARIA",
                          "SCRYPT", "CHACHA", "POLY1305", "BLAKE2",
+                        "SIPHASH",
                         # EC_NISTP_64_GCC_128
                         "EC_NISTP_64_GCC_128",
                         # Envelope "algorithms"
@@ -172,7 +173,7 @@ foreach (@ARGV, split(/ /, $config{options}))
 
        $do_ssl=1 if $_ eq "libssl";
        if ($_ eq "ssl") {
-               $do_ssl=1; 
+               $do_ssl=1;
                $libname=$_
        }
        $do_crypto=1 if $_ eq "libcrypto";
@@ -211,7 +212,7 @@ foreach (@ARGV, split(/ /, $config{options}))
 
        }
 
-if (!$libname) { 
+if (!$libname) {
        if ($do_ssl) {
                $libname="LIBSSL";
        }
@@ -247,7 +248,6 @@ $ssl.=" include/openssl/srtp.h";
 my $crypto ="include/openssl/crypto.h";
 $crypto.=" include/internal/o_dir.h";
 $crypto.=" include/internal/o_str.h";
-$crypto.=" include/internal/threads.h";
 $crypto.=" include/internal/err.h";
 $crypto.=" include/openssl/des.h" ; # unless $no_des;
 $crypto.=" include/openssl/idea.h" ; # unless $no_idea;
@@ -340,7 +340,7 @@ if($do_crypto == 1) {
        }
        &update_numbers(*OUT,"LIBCRYPTO",*crypto_list,$max_crypto,@crypto_symbols);
        close OUT;
-} 
+}
 
 } elsif ($do_checkexist) {
        &check_existing(*ssl_list, @ssl_symbols)
@@ -816,7 +816,7 @@ sub do_defs
                                        $def .=
                                            "#INFO:"
                                                .join(',',@current_platforms).":"
-                                                   .join(',',@current_algorithms).";";
+                                                   .join(',',"STDIO",@current_algorithms).";";
                                        $def .= "int PEM_read_$1(void);";
                                        $def .= "int PEM_write_$1(void);";
                                        $def .=
@@ -833,7 +833,7 @@ sub do_defs
                                        $def .=
                                            "#INFO:"
                                                .join(',',@current_platforms).":"
-                                                   .join(',',@current_algorithms).";";
+                                                   .join(',',"STDIO",@current_algorithms).";";
                                        $def .= "int PEM_write_$1(void);";
                                        $def .=
                                            "#INFO:"
@@ -847,12 +847,12 @@ sub do_defs
                                        $def .=
                                            "#INFO:"
                                                .join(',',@current_platforms).":"
-                                                   .join(',',@current_algorithms).";";
+                                                   .join(',',"STDIO",@current_algorithms).";";
                                        $def .= "int PEM_read_$1(void);";
                                        $def .=
                                            "#INFO:"
                                                .join(',',@current_platforms).":"
-                                                   .join(',',@current_algorithms).";";
+                                                   .join(',',"STDIO",@current_algorithms).";";
                                        # Things that are everywhere
                                        $def .= "int PEM_read_bio_$1(void);";
                                        next;
@@ -1122,6 +1122,7 @@ sub is_valid
                        if ($keyword eq "VMSNonVAX" && $VMSNonVAX) { return 1; }
                        if ($keyword eq "VMS" && $VMS) { return 1; }
                        if ($keyword eq "WIN32" && $W32) { return 1; }
+                       if ($keyword eq "_WIN32" && $W32) { return 1; }
                        if ($keyword eq "WINNT" && $NT) { return 1; }
                        # Special platforms:
                        # EXPORT_VAR_AS_FUNCTION means that global variables
@@ -1325,11 +1326,11 @@ EOF
                                             print OUT $symline;
                                             $symvtextcount += length($symline) - 2;
                                        } elsif($v) {
-                                               printf OUT "    %s%-39s @%-8d DATA\n",
-                                                               ($W32)?"":"_",$s2,$n;
+                                               printf OUT "    %s%-39s DATA\n",
+                                                               ($W32)?"":"_",$s2;
                                        } else {
-                                               printf OUT "    %s%-39s @%d\n",
-                                                               ($W32)?"":"_",$s2,$n;
+                                               printf OUT "    %s%s\n",
+                                                               ($W32)?"":"_",$s2;
                                        }
                                }
                        }
@@ -1630,8 +1631,7 @@ sub check_version_lte()
        if ($cvnums ne $tvnums) {
                die "Invalid version number: $testversion "
                        ."for current version $currversion\n"
-                       if (substr($cvnums, -1) < substr($tvnums, -1)
-                               || substr($cvnums, 0, 4) ne substr($tvnums, 0, 4));
+                       if (substr($cvnums, 0, 4) ne substr($tvnums, 0, 4));
                return;
        }
        #If we get here then the base version (i.e. the numbers) are the same - they