projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Various updates to mkdef.pl to cope with new aes
[openssl.git] / util / mkdef.pl
diff --git a/util/mkdef.pl b/util/mkdef.pl
index dc21310e47b00ab75089442cfc07f98813e96582..bcf875f546fd2256be49c394bc7ef0bca6cfb79a 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -63,7 +63,7 @@ my $do_crypto = 0;
 my $do_ssl = 0;
 my $do_ctest = 0;
 my $do_ctestall = 0;
 my $do_ssl = 0;
 my $do_ctest = 0;
 my $do_ctestall = 0;
-my $rsaref = 0;
+my $do_checkexist = 0;
 
 my $VMS=0;
 my $W32=0;
 
 my $VMS=0;
 my $W32=0;
@@ -75,9 +75,16 @@ my $safe_stack_def = 0;
 my @known_platforms = ( "__FreeBSD__", "VMS", "WIN16", "WIN32",
                        "WINNT", "PERL5", "NeXT" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
 my @known_platforms = ( "__FreeBSD__", "VMS", "WIN16", "WIN32",
                        "WINNT", "PERL5", "NeXT" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
-                        "CAST", "MD2", "MD4", "MD5", "SHA", "RIPEMD",
-                        "MDC2", "RSA", "DSA", "DH", "HMAC", "FP_API",
-                        "RIJNDAEL" );
+                        "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
+                        "RIPEMD",
+                        "MDC2", "RSA", "DSA", "DH", "HMAC", "AES",
+                        # Envelope "algorithms"
+                        "EVP", "X509", "ASN1_TYPEDEFS",
+                        # Helper "algorithms"
+                        "BIO", "COMP", "BUFFER", "LHASH", "STACK", "ERR",
+                        "LOCKING",
+                        # External "algorithms"
+                        "FP_API", "STDIO", "SOCK", "KRB5" );
 
 my $options="";
 open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
 
 my $options="";
 open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
@@ -92,7 +99,7 @@ close(IN);
 my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf;
 my $no_cast;
 my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;
 my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf;
 my $no_cast;
 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_rijndael;
+my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes;
 my $no_fp_api;
 
 foreach (@ARGV, split(/ /, $options))
 my $no_fp_api;
 
 foreach (@ARGV, split(/ /, $options))
@@ -104,7 +111,6 @@ foreach (@ARGV, split(/ /, $options))
                $NT = 1;
        }
        $VMS=1 if $_ eq "VMS";
                $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_ssl=1 if $_ eq "ssleay";
        $do_ssl=1 if $_ eq "ssl";
@@ -114,6 +120,7 @@ foreach (@ARGV, split(/ /, $options))
        $do_rewrite=1 if $_ eq "rewrite";
        $do_ctest=1 if $_ eq "ctest";
        $do_ctestall=1 if $_ eq "ctestall";
        $do_rewrite=1 if $_ eq "rewrite";
        $do_ctest=1 if $_ eq "ctest";
        $do_ctestall=1 if $_ eq "ctestall";
+       $do_checkexist=1 if $_ eq "exist";
        #$safe_stack_def=1 if $_ eq "-DDEBUG_SAFESTACK";
 
        if    (/^no-rc2$/)      { $no_rc2=1; }
        #$safe_stack_def=1 if $_ eq "-DDEBUG_SAFESTACK";
 
        if    (/^no-rc2$/)      { $no_rc2=1; }
@@ -133,7 +140,16 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-dsa$/)      { $no_dsa=1; }
        elsif (/^no-dh$/)       { $no_dh=1; }
        elsif (/^no-hmac$/)     { $no_hmac=1; }
        elsif (/^no-dsa$/)      { $no_dsa=1; }
        elsif (/^no-dh$/)       { $no_dh=1; }
        elsif (/^no-hmac$/)     { $no_hmac=1; }
-       elsif (/^no-rijndael$/) { $no_rijndael=1; }
+       elsif (/^no-aes$/)      { $no_aes=1; }
+       elsif (/^no-evp$/)      { $no_evp=1; }
+       elsif (/^no-lhash$/)    { $no_lhash=1; }
+       elsif (/^no-stack$/)    { $no_stack=1; }
+       elsif (/^no-err$/)      { $no_err=1; }
+       elsif (/^no-buffer$/)   { $no_buffer=1; }
+       elsif (/^no-bio$/)      { $no_bio=1; }
+       #elsif (/^no-locking$/) { $no_locking=1; }
+       elsif (/^no-comp$/)     { $no_comp=1; }
+       elsif (/^no-dso$/)      { $no_dso=1; }
        }
 
 
        }
 
 
@@ -159,6 +175,7 @@ $max_ssl = $max_num;
 $max_crypto = $max_num;
 
 my $ssl="ssl/ssl.h";
 $max_crypto = $max_num;
 
 my $ssl="ssl/ssl.h";
+$ssl.=" ssl/kssl.h";
 
 my $crypto ="crypto/crypto.h";
 $crypto.=" crypto/des/des.h" unless $no_des;
 
 my $crypto ="crypto/crypto.h";
 $crypto.=" crypto/des/des.h" unless $no_des;
@@ -174,8 +191,8 @@ $crypto.=" crypto/md5/md5.h" unless $no_md5;
 $crypto.=" crypto/mdc2/mdc2.h" unless $no_mdc2;
 $crypto.=" crypto/sha/sha.h" unless $no_sha;
 $crypto.=" crypto/ripemd/ripemd.h" unless $no_ripemd;
 $crypto.=" crypto/mdc2/mdc2.h" unless $no_mdc2;
 $crypto.=" crypto/sha/sha.h" unless $no_sha;
 $crypto.=" crypto/ripemd/ripemd.h" unless $no_ripemd;
-$crypto.=" crypto/rijndael/rijndael.h" unless $no_rijndael;
-$crypto.=" crypto/rijndael/rd_fst.h" unless $no_rijndael;
+$crypto.=" crypto/rijndael/rijndael.h" unless $no_aes;
+$crypto.=" crypto/rijndael/rd_fst.h" unless $no_aes;
 
 $crypto.=" crypto/bn/bn.h";
 $crypto.=" crypto/rsa/rsa.h" unless $no_rsa;
 
 $crypto.=" crypto/bn/bn.h";
 $crypto.=" crypto/rsa/rsa.h" unless $no_rsa;
@@ -184,29 +201,29 @@ $crypto.=" crypto/dh/dh.h" unless $no_dh;
 $crypto.=" crypto/hmac/hmac.h" unless $no_hmac;
 
 $crypto.=" crypto/engine/engine.h";
 $crypto.=" crypto/hmac/hmac.h" unless $no_hmac;
 
 $crypto.=" crypto/engine/engine.h";
-$crypto.=" crypto/stack/stack.h";
-$crypto.=" crypto/buffer/buffer.h";
-$crypto.=" crypto/bio/bio.h";
-$crypto.=" crypto/dso/dso.h";
-$crypto.=" crypto/lhash/lhash.h";
+$crypto.=" crypto/stack/stack.h" unless $no_stack;
+$crypto.=" crypto/buffer/buffer.h" unless $no_buffer;
+$crypto.=" crypto/bio/bio.h" unless $no_bio;
+$crypto.=" crypto/dso/dso.h" unless $no_dso;
+$crypto.=" crypto/lhash/lhash.h" unless $no_lhash;
 $crypto.=" crypto/conf/conf.h";
 $crypto.=" crypto/txt_db/txt_db.h";
 
 $crypto.=" crypto/conf/conf.h";
 $crypto.=" crypto/txt_db/txt_db.h";
 
-$crypto.=" crypto/evp/evp.h";
+$crypto.=" crypto/evp/evp.h" unless $no_evp;
 $crypto.=" crypto/objects/objects.h";
 $crypto.=" crypto/pem/pem.h";
 #$crypto.=" crypto/meth/meth.h";
 $crypto.=" crypto/asn1/asn1.h";
 $crypto.=" crypto/asn1/asn1t.h";
 $crypto.=" crypto/asn1/asn1_mac.h";
 $crypto.=" crypto/objects/objects.h";
 $crypto.=" crypto/pem/pem.h";
 #$crypto.=" crypto/meth/meth.h";
 $crypto.=" crypto/asn1/asn1.h";
 $crypto.=" crypto/asn1/asn1t.h";
 $crypto.=" crypto/asn1/asn1_mac.h";
-$crypto.=" crypto/err/err.h";
+$crypto.=" crypto/err/err.h" unless $no_err;
 $crypto.=" crypto/pkcs7/pkcs7.h";
 $crypto.=" crypto/pkcs12/pkcs12.h";
 $crypto.=" crypto/x509/x509.h";
 $crypto.=" crypto/x509/x509_vfy.h";
 $crypto.=" crypto/x509v3/x509v3.h";
 $crypto.=" crypto/rand/rand.h";
 $crypto.=" crypto/pkcs7/pkcs7.h";
 $crypto.=" crypto/pkcs12/pkcs12.h";
 $crypto.=" crypto/x509/x509.h";
 $crypto.=" crypto/x509/x509_vfy.h";
 $crypto.=" crypto/x509v3/x509v3.h";
 $crypto.=" crypto/rand/rand.h";
-$crypto.=" crypto/comp/comp.h";
+$crypto.=" crypto/comp/comp.h" unless $no_comp;
 $crypto.=" crypto/ocsp/ocsp.h";
 $crypto.=" crypto/tmdiff.h";
 
 $crypto.=" crypto/ocsp/ocsp.h";
 $crypto.=" crypto/tmdiff.h";
 
@@ -244,6 +261,11 @@ if($do_crypto == 1) {
        close OUT;
 } 
 
        close OUT;
 } 
 
+} elsif ($do_checkexist) {
+       &check_existing(*ssl_list, @ssl_symbols)
+               if $do_ssl == 1;
+       &check_existing(*crypto_list, @crypto_symbols)
+               if $do_crypto == 1;
 } elsif ($do_ctest || $do_ctestall) {
 
        print <<"EOF";
 } elsif ($do_ctest || $do_ctestall) {
 
        print <<"EOF";
@@ -285,6 +307,7 @@ sub do_defs
        my %algorithm;          # For anything undefined, we assume ""
        my %rename;
        my $cpp;
        my %algorithm;          # For anything undefined, we assume ""
        my %rename;
        my $cpp;
+       my %unknown_algorithms = ();
 
        foreach $file (split(/\s+/,$symhacksfile." ".$files))
                {
 
        foreach $file (split(/\s+/,$symhacksfile." ".$files))
                {
@@ -320,16 +343,17 @@ sub do_defs
 
                        s/\/\*.*?\*\///gs;                   # ignore comments
                        s/{[^{}]*}//gs;                      # ignore {} blocks
 
                        s/\/\*.*?\*\///gs;                   # ignore comments
                        s/{[^{}]*}//gs;                      # ignore {} blocks
-                       if (/^\#\s*ifndef (.*)/) {
+                       #print STDERR "DEBUG: \$_=\"$_\"\n";
+                       if (/^\#\s*ifndef\s+(.*)/) {
                                push(@tag,$1);
                                $tag{$1}=-1;
                                push(@tag,$1);
                                $tag{$1}=-1;
-                       } elsif (/^\#\s*if !defined\(([^\)]+)\)/) {
+                       } elsif (/^\#\s*if\s+!defined\(([^\)]+)\)/) {
                                push(@tag,$1);
                                $tag{$1}=-1;
                                push(@tag,$1);
                                $tag{$1}=-1;
-                       } elsif (/^\#\s*ifdef (.*)/) {
+                       } elsif (/^\#\s*ifdef\s+(.*)/) {
                                push(@tag,$1);
                                $tag{$1}=1;
                                push(@tag,$1);
                                $tag{$1}=1;
-                       } elsif (/^\#\s*if defined\(([^\)]+)\)/) {
+                       } elsif (/^\#\s*if\s+defined\(([^\)]+)\)/) {
                                push(@tag,$1);
                                $tag{$1}=1;
                        } elsif (/^\#\s*error\s+(\w+) is disabled\./) {
                                push(@tag,$1);
                                $tag{$1}=1;
                        } elsif (/^\#\s*error\s+(\w+) is disabled\./) {
@@ -337,12 +361,24 @@ sub do_defs
                                        $tag{$tag[$#tag]}=2;
                                }
                        } elsif (/^\#\s*endif/) {
                                        $tag{$tag[$#tag]}=2;
                                }
                        } elsif (/^\#\s*endif/) {
+                               my $oldtag=$tag[$#tag];
+                               #print STDERR "DEBUG: \$oldtag=\"$oldtag\"\n";
                                if ($tag{$tag[$#tag]}==2) {
                                        $tag{$tag[$#tag]}=-1;
                                } else {
                                        $tag{$tag[$#tag]}=0;
                                }
                                pop(@tag);
                                if ($tag{$tag[$#tag]}==2) {
                                        $tag{$tag[$#tag]}=-1;
                                } else {
                                        $tag{$tag[$#tag]}=0;
                                }
                                pop(@tag);
+                               if ($oldtag =~ /^NO_([A-Z0-9_]+)$/) {
+                                       $oldtag=$1;
+                               } else {
+                                       $oldtag="";
+                               }
+                               if ($oldtag ne ""
+                                   && !grep(/^$oldtag$/, @known_algorithms)) {
+                                       $unknown_algorithms{$oldtag} = 1;
+                                       #print STDERR "DEBUG: Added as unknown algorithm: $oldtag\n";
+                               }
                        } elsif (/^\#\s*else/) {
                                my $t=$tag[$#tag];
                                $tag{$t}= -$tag{$t};
                        } elsif (/^\#\s*else/) {
                                my $t=$tag[$#tag];
                                $tag{$t}= -$tag{$t};
@@ -377,6 +413,12 @@ sub do_defs
                        }
                        if (/^\s*DECLARE_STACK_OF\s*\(\s*(\w*)\s*\)/) {
                                next;
                        }
                        if (/^\s*DECLARE_STACK_OF\s*\(\s*(\w*)\s*\)/) {
                                next;
+                       } elsif (/^\s*DECLARE_ASN1_ENCODE_FUNCTIONS\s*\(\s*(\w*)\s*,\s*(\w*)\s*,\s*(\w*)\s*\)/) {
+                               $syms{"d2i_$3"} = 1;
+                               $syms{"i2d_$3"} = 1;
+                               $syms{"$2_it"} = 1;
+                               $kind{"$2_it"} = "VARIABLE";
+                               next;
                        } elsif (/^\s*DECLARE_ASN1_FUNCTIONS_fname\s*\(\s*(\w*)\s*,\s*(\w*)\s*,\s*(\w*)\s*\)/) {
                                $syms{"d2i_$3"} = 1;
                                $syms{"i2d_$3"} = 1;
                        } elsif (/^\s*DECLARE_ASN1_FUNCTIONS_fname\s*\(\s*(\w*)\s*,\s*(\w*)\s*,\s*(\w*)\s*\)/) {
                                $syms{"d2i_$3"} = 1;
                                $syms{"i2d_$3"} = 1;
@@ -384,7 +426,8 @@ sub do_defs
                                $syms{"$3_free"} = 1;
                                $syms{"$2_it"} = 1;
                                $kind{"$2_it"} = "VARIABLE";
                                $syms{"$3_free"} = 1;
                                $syms{"$2_it"} = 1;
                                $kind{"$2_it"} = "VARIABLE";
-                       } elsif (/^\s*DECLARE_ASN1_FUNCTIONS\s*\(\s*(\w*)\s*\)/) {
+                       } elsif (/^\s*DECLARE_ASN1_FUNCTIONS\s*\(\s*(\w*)\s*\)/ ||
+                               /^\s*DECLARE_ASN1_FUNCTIONS_const\s*\(\s*(\w*)\s*\)/) {
                                $syms{"d2i_$1"} = 1;
                                $syms{"i2d_$1"} = 1;
                                $syms{"$1_new"} = 1;
                                $syms{"d2i_$1"} = 1;
                                $syms{"i2d_$1"} = 1;
                                $syms{"$1_new"} = 1;
@@ -392,6 +435,24 @@ sub do_defs
                                $syms{"$1_it"} = 1;
                                $kind{"$1_it"} = "VARIABLE";
                                next;
                                $syms{"$1_it"} = 1;
                                $kind{"$1_it"} = "VARIABLE";
                                next;
+                       } elsif (/^\s*DECLARE_ASN1_ENCODE_FUNCTIONS_const\s*\(\s*(\w*)\s*,\s*(\w*)\s*\)/) {
+                               $syms{"d2i_$2"} = 1;
+                               $syms{"i2d_$2"} = 1;
+                               $syms{"$2_it"} = 1;
+                               $kind{"$2_it"} = "VARIABLE";
+                               next;
+                       } elsif (/^\s*DECLARE_ASN1_FUNCTIONS_name\s*\(\s*(\w*)\s*,\s*(\w*)\s*\)/) {
+                               $syms{"d2i_$2"} = 1;
+                               $syms{"i2d_$2"} = 1;
+                               $syms{"$2_new"} = 1;
+                               $syms{"$2_free"} = 1;
+                               $syms{"$2_it"} = 1;
+                               $kind{"$2_it"} = "VARIABLE";
+                               next;
+                       } elsif (/^\s*DECLARE_ASN1_ITEM\s*\(\s*(\w*)\s*,(\w*)\s*\)/) {
+                               $syms{"$1_it"} = 1;
+                               $kind{"$1_it"} = "VARIABLE";
+                               next;
                        } elsif (/^\s*DECLARE_PKCS12_STACK_OF\s*\(\s*(\w*)\s*\)/) {
                                next;
                        } elsif (/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) {
                        } elsif (/^\s*DECLARE_PKCS12_STACK_OF\s*\(\s*(\w*)\s*\)/) {
                                next;
                        } elsif (/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) {
@@ -573,14 +634,15 @@ sub do_defs
 
        # Info we know about
 
 
        # Info we know about
 
-       $platform{"RSA_PKCS1_RSAref"} = "RSAREF";
-       $algorithm{"RSA_PKCS1_RSAref"} = "RSA";
-
        push @ret, map { $_."\\".&info_string($_,"EXIST",
                                              $platform{$_},
                                              $kind{$_},
                                              $algorithm{$_}) } keys %syms;
 
        push @ret, map { $_."\\".&info_string($_,"EXIST",
                                              $platform{$_},
                                              $kind{$_},
                                              $algorithm{$_}) } keys %syms;
 
+       if (keys %unknown_algorithms) {
+               print STDERR "WARNING: mkdef.pl doesn't know the following algorithms:\n";
+               print STDERR "\t",join("\n\t",keys %unknown_algorithms),"\n";
+       }
        return(@ret);
 }
 
        return(@ret);
 }
 
@@ -745,7 +807,6 @@ EOF
                        # @p_purged must contain hardware platforms only
                        my @p_purged = ();
                        foreach $ptmp (@p) {
                        # @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);
                                push @p_purged, $ptmp;
                        }
                        my $negatives = !!grep(/^!/,@p);
@@ -759,11 +820,6 @@ EOF
                             || ($W16 && (!@p_purged
                                          || (!$negatives && grep(/^WIN16$/,@p))
                                          || ($negatives && !grep(/^!WIN16$/,@p)))))
                             || ($W16 && (!@p_purged
                                          || (!$negatives && grep(/^WIN16$/,@p))
                                          || ($negatives && !grep(/^!WIN16$/,@p)))))
-                           && (!@p
-                               || (!$negatives
-                                   && ($rsaref || !grep(/^RSAREF$/,@p)))
-                               || ($negatives
-                                   && (!$rsaref || !grep(/^!RSAREF$/,@p))))
                            && (!@a || (!$no_rc2 || !grep(/^RC2$/,@a)))
                            && (!@a || (!$no_rc4 || !grep(/^RC4$/,@a)))
                            && (!@a || (!$no_rc5 || !grep(/^RC5$/,@a)))
                            && (!@a || (!$no_rc2 || !grep(/^RC2$/,@a)))
                            && (!@a || (!$no_rc4 || !grep(/^RC4$/,@a)))
                            && (!@a || (!$no_rc5 || !grep(/^RC5$/,@a)))
@@ -781,7 +837,7 @@ EOF
                            && (!@a || (!$no_dsa || !grep(/^DSA$/,@a)))
                            && (!@a || (!$no_dh || !grep(/^DH$/,@a)))
                            && (!@a || (!$no_hmac || !grep(/^HMAC$/,@a)))
                            && (!@a || (!$no_dsa || !grep(/^DSA$/,@a)))
                            && (!@a || (!$no_dh || !grep(/^DH$/,@a)))
                            && (!@a || (!$no_hmac || !grep(/^HMAC$/,@a)))
-                           && (!@a || (!$no_rijndael || !grep(/^RIJNDAEL$/,@a)))
+                           && (!@a || (!$no_aes || !grep(/^AES$/,@a)))
                            && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a)))
                            ) {
                                if($v) {
                            && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a)))
                            ) {
                                if($v) {
Unnamed repository; edit this file 'description' to name the repository.