Fix various windows compilation issues

[openssl.git] / util / mkdef.pl

diff --git a/util/mkdef.pl b/util/mkdef.pl
index ccd72f58872204bc61c20535e366347d76866d20..faed4028b52cda331b5ade3d254b11353058192a 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -72,7 +72,6 @@ my $VMSVAX=0;
 my $VMSNonVAX=0;
 my $VMS=0;
 my $W32=0;
-my $W16=0;
 my $NT=0;
 my $OS2=0;
 # Set this to make typesafe STACK definitions appear in DEF
@@ -81,7 +80,7 @@ my $safe_stack_def = 0;
 my @known_platforms = ( "__FreeBSD__", "PERL5",
                        "EXPORT_VAR_AS_FUNCTION", "ZLIB",
                        "OPENSSL_FIPS", "OPENSSL_FIPSCAPABLE" );
-my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
+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", "RIPEMD",
@@ -98,8 +97,6 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "FP_API", "STDIO", "SOCK", "KRB5", "DGRAM",
                         # Engines
                         "STATIC_ENGINE", "ENGINE", "HW", "GMP",
-                        # RFC3779
-                        "RFC3779",
                         # TLS
                         "TLSEXT", "PSK", "SRP", "HEARTBEATS",
                         # CMS
@@ -123,7 +120,9 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         # SSL TRACE
                         "SSL_TRACE",
                         # Unit testing
-                        "UNIT_TEST");
+                        "UNIT_TEST",
+                        # OCB mode
+                        "OCB");
 
 my $options="";
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -141,10 +140,10 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;
 my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
 my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
-my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
+my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
 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_unit_test; my $no_ssl3_method; my $no_ocb;
 
 my $fips;
 
@@ -155,7 +154,7 @@ foreach (@ARGV, split(/ /, $options))
        {
        $debug=1 if $_ eq "debug";
        $W32=1 if $_ eq "32";
-       $W16=1 if $_ eq "16";
+       die "win16 not supported" if $_ eq "16";
        if($_ eq "NT") {
                $W32 = 1;
                $NT = 1;
@@ -232,7 +231,6 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-engine$/)   { $no_engine=1; }
        elsif (/^no-hw$/)       { $no_hw=1; }
        elsif (/^no-gmp$/)      { $no_gmp=1; }
-       elsif (/^no-rfc3779$/)  { $no_rfc3779=1; }
        elsif (/^no-tlsext$/)   { $no_tlsext=1; }
        elsif (/^no-cms$/)      { $no_cms=1; }
        elsif (/^no-ec2m$/)     { $no_ec2m=1; }
@@ -246,6 +244,8 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-sctp$/)     { $no_sctp=1; }
        elsif (/^no-srtp$/)     { $no_srtp=1; }
        elsif (/^no-unit-test$/){ $no_unit_test=1; }
+       elsif (/^no-deprecated$/) { $no_deprecated=1; }
+       elsif (/^no-ocb/){ $no_ocb=1; }
        }
 
 
@@ -259,15 +259,10 @@ if (!$libname) {
 }
 
 # If no platform is given, assume WIN32
-if ($W32 + $W16 + $VMS + $OS2 == 0) {
+if ($W32 + $VMS + $OS2 == 0) {
        $W32 = 1;
 }
 
-# Add extra knowledge
-if ($W16) {
-       $no_fp_api=1;
-}
-
 if (!$do_ssl && !$do_crypto)
        {
        print STDERR "usage: $0 ( ssl | crypto ) [ 16 | 32 | NT | OS2 ]\n";
@@ -840,10 +835,9 @@ sub do_defs
                                } elsif (/^DECLARE_PEM_rw\s*\(\s*(\w*)\s*,/ ||
                                         /^DECLARE_PEM_rw_cb\s*\(\s*(\w*)\s*,/ ||
                                         /^DECLARE_PEM_rw_const\s*\(\s*(\w*)\s*,/ ) {
-                                       # Things not in Win16
                                        $def .=
                                            "#INFO:"
-                                               .join(',',"!WIN16",@current_platforms).":"
+                                               .join(',',@current_platforms).":"
                                                    .join(',',@current_algorithms).";";
                                        $def .= "int PEM_read_$1(void);";
                                        $def .= "int PEM_write_$1(void);";
@@ -858,10 +852,9 @@ sub do_defs
                                } elsif (/^DECLARE_PEM_write\s*\(\s*(\w*)\s*,/ ||
                                        /^DECLARE_PEM_write_const\s*\(\s*(\w*)\s*,/ ||
                                         /^DECLARE_PEM_write_cb\s*\(\s*(\w*)\s*,/ ) {
-                                       # Things not in Win16
                                        $def .=
                                            "#INFO:"
-                                               .join(',',"!WIN16",@current_platforms).":"
+                                               .join(',',@current_platforms).":"
                                                    .join(',',@current_algorithms).";";
                                        $def .= "int PEM_write_$1(void);";
                                        $def .=
@@ -873,10 +866,9 @@ sub do_defs
                                        next;
                                } elsif (/^DECLARE_PEM_read\s*\(\s*(\w*)\s*,/ ||
                                         /^DECLARE_PEM_read_cb\s*\(\s*(\w*)\s*,/ ) {
-                                       # Things not in Win16
                                        $def .=
                                            "#INFO:"
-                                               .join(',',"!WIN16",@current_platforms).":"
+                                               .join(',',@current_platforms).":"
                                                    .join(',',@current_algorithms).";";
                                        $def .= "int PEM_read_$1(void);";
                                        $def .=
@@ -983,7 +975,6 @@ sub do_defs
                        $a .= ",RC4" if($s =~ /EVP_rc4/);
                        $a .= ",RC5" if($s =~ /EVP_rc5/);
                        $a .= ",RIPEMD" if($s =~ /EVP_ripemd/);
-                       $a .= ",SHA" if($s =~ /EVP_sha/);
                        $a .= ",RSA" if($s =~ /EVP_(Open|Seal)(Final|Init)/);
                        $a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/);
                        $a .= ",RSA" if($s =~ /RSAPrivateKey/);
@@ -1013,7 +1004,7 @@ sub do_defs
        # Prune the returned symbols
 
         delete $syms{"bn_dump1"};
-       $platform{"BIO_s_log"} .= ",!WIN32,!WIN16,!macintosh";
+       $platform{"BIO_s_log"} .= ",!WIN32,!macintosh";
 
        $platform{"PEM_read_NS_CERT_SEQ"} = "VMS";
        $platform{"PEM_write_NS_CERT_SEQ"} = "VMS";
@@ -1160,14 +1151,13 @@ 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 "WIN16" && $W16) { return 1; }
                        if ($keyword eq "WINNT" && $NT) { return 1; }
                        if ($keyword eq "OS2" && $OS2) { return 1; }
                        # Special platforms:
                        # EXPORT_VAR_AS_FUNCTION means that global variables
                        # will be represented as functions.  This currently
                        # only happens on VMS-VAX.
-                       if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) {
+                       if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32)) {
                                return 1;
                        }
                        if ($keyword eq "OPENSSL_FIPSCAPABLE") {
@@ -1218,7 +1208,6 @@ sub is_valid
                        if ($keyword eq "FP_API" && $no_fp_api) { return 0; }
                        if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; }
                        if ($keyword eq "GMP" && $no_gmp) { return 0; }
-                       if ($keyword eq "RFC3779" && $no_rfc3779) { return 0; }
                        if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
                        if ($keyword eq "PSK" && $no_psk) { return 0; }
                        if ($keyword eq "CMS" && $no_cms) { return 0; }
@@ -1235,6 +1224,7 @@ sub is_valid
                        if ($keyword eq "SRTP" && $no_srtp) { return 0; }
                        if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; }
                        if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
+                       if ($keyword eq "OCB" && $no_ocb) { return 0; }
 
                        # Nothing recognise as true
                        return 1;
@@ -1313,8 +1303,6 @@ sub print_def_file
 
        if ($W32)
                { $libname.="32"; }
-       elsif ($W16)
-               { $libname.="16"; }
        elsif ($OS2)
                { # DLL names should not clash on the whole system.
                  # However, they should not have any particular relationship
@@ -1339,19 +1327,6 @@ LIBRARY         $libname $liboptions
 
 EOF
 
-       if ($W16) {
-               print <<"EOF";
-CODE            PRELOAD MOVEABLE
-DATA            PRELOAD MOVEABLE SINGLE
-
-EXETYPE                WINDOWS
-
-HEAPSIZE       4096
-STACKSIZE      8192
-
-EOF
-       }
-
        print "EXPORTS\n";
 
        (@e)=grep(/^SSLeay(\{[0-9]+\})?\\.*?:.*?:FUNCTION/,@symbols);