projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Enhancements to mkdef.pl:
[openssl.git] / util / mkdef.pl
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 403f82367617be91d450bc4ac60787e9a5253ea6..961dff5b8fc9761634f4da5a7b10a4faa3204584 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -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",
-                        "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", "RIJNDAEL",
+                        # 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";
@@ -134,6 +141,15 @@ foreach (@ARGV, split(/ /, $options))
        elsif (/^no-dh$/)       { $no_dh=1; }
        elsif (/^no-hmac$/)     { $no_hmac=1; }
        elsif (/^no-rijndael$/) { $no_rijndael=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";
+$ssl.=" ssl/kssl.h";
 
 my $crypto ="crypto/crypto.h";
 $crypto.=" crypto/des/des.h" unless $no_des;
@@ -175,6 +192,7 @@ $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/bn/bn.h";
 $crypto.=" crypto/rsa/rsa.h" unless $no_rsa;
@@ -183,28 +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/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/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/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/comp/comp.h";
+$crypto.=" crypto/comp/comp.h" unless $no_comp;
 $crypto.=" crypto/ocsp/ocsp.h";
 $crypto.=" crypto/tmdiff.h";
 
@@ -283,6 +302,7 @@ sub do_defs
        my %algorithm;          # For anything undefined, we assume ""
        my %rename;
        my $cpp;
+       my %unknown_algorithms = ();
 
        foreach $file (split(/\s+/,$symhacksfile." ".$files))
                {
@@ -318,16 +338,17 @@ sub do_defs
 
                        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;
-                       } elsif (/^\#\s*if !defined\(([^\)]+)\)/) {
+                       } elsif (/^\#\s*if\s+!defined\(([^\)]+)\)/) {
                                push(@tag,$1);
                                $tag{$1}=-1;
-                       } elsif (/^\#\s*ifdef (.*)/) {
+                       } elsif (/^\#\s*ifdef\s+(.*)/) {
                                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\./) {
@@ -335,12 +356,24 @@ sub do_defs
                                        $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 ($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};
@@ -375,6 +408,21 @@ sub do_defs
                        }
                        if (/^\s*DECLARE_STACK_OF\s*\(\s*(\w*)\s*\)/) {
                                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;
+                               $syms{"$3_new"} = 1;
+                               $syms{"$3_free"} = 1;
+                               $syms{"$2_it"} = 1;
+                               $kind{"$2_it"} = "VARIABLE";
+                       } elsif (/^\s*DECLARE_ASN1_FUNCTIONS\s*\(\s*(\w*)\s*\)/) {
+                               $syms{"d2i_$1"} = 1;
+                               $syms{"i2d_$1"} = 1;
+                               $syms{"$1_new"} = 1;
+                               $syms{"$1_free"} = 1;
+                               $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*\)/) {
@@ -564,6 +612,10 @@ sub do_defs
                                              $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);
 }
 
@@ -611,6 +663,7 @@ sub maybe_add_info {
        (my $name, *nums, my @symbols) = @_;
        my $sym;
        my $new_info = 0;
+       my %syms=();
 
        print STDERR "Updating $name info\n";
        foreach $sym (@symbols) {
@@ -624,6 +677,16 @@ sub maybe_add_info {
                                #print STDERR "DEBUG: maybe_add_info for $s: \"$dummy\" => \"$i\"\n";
                        }
                }
+               $syms{sym} = 1;
+       }
+
+       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};
+               if (!defined($syms{sym})) {
+                       $new_info++;
+                       #print STDERR "DEBUG: maybe_add_info for $sym: -> undefined\n";
+               }
        }
        if ($new_info) {
                print STDERR "$new_info old symbols got an info update\n";
@@ -663,7 +726,7 @@ sub print_test_file
 sub print_def_file
 {
        (*OUT,my $name,*nums,my @symbols)=@_;
-       my $n = 1; my @e; my @r;
+       my $n = 1; my @e; my @r; my @v;
 
        if ($W32)
                { $name.="32"; }
@@ -698,11 +761,14 @@ EOF
 
        (@e)=grep(/^SSLeay\\.*?:.*?:FUNCTION/,@symbols);
        (@r)=grep(/^\w+\\.*?:.*?:FUNCTION/ && !/^SSLeay\\.*?:.*?:FUNCTION/,@symbols);
-       @symbols=((sort @e),(sort @r));
+       (@v)=grep(/^\w+\\.*?:.*?:VARIABLE/,@symbols);
+       @symbols=((sort @e),(sort @r), (sort @v));
 
 
        foreach $sym (@symbols) {
                (my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/;
+               my $v = 0;
+               $v = 1 if $sym=~ /^\w+\\.*?:.*?:VARIABLE/;
                if (!defined($nums{$s})) {
                        printf STDERR "Warning: $s does not have a number assigned\n"
                                        if(!$do_update);
@@ -753,7 +819,11 @@ EOF
                            && (!@a || (!$no_rijndael || !grep(/^RIJNDAEL$/,@a)))
                            && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a)))
                            ) {
-                               printf OUT "    %s%-40s@%d\n",($W32)?"":"_",$s,$n;
+                               if($v) {
+                                       printf OUT "    %s%-40s@%-8d DATA\n",($W32)?"":"_",$s,$n;
+                               } else {
+                                       printf OUT "    %s%-40s@%d\n",($W32)?"":"_",$s,$n;
+                               }
 #                      } else {
 #                              print STDERR "DEBUG: \"$sym\" (@p):",
 #                              " rsaref:", !!(!@p
@@ -852,12 +922,19 @@ sub rewrite_numbers
                $rsyms{$s} = 1;
        }
 
+       my %syms = ();
+       foreach $_ (@symbols) {
+               (my $n, my $i) = split /\\/;
+               $syms{$n} = 1;
+       }
+
        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};
                next if defined($i) && $i =~ /^.*?:.*?:\w+\(\w+\)/;
                next if defined($rsyms{$sym});
-               $i="NOEXIST::FUNCTION:" if !defined($i) || $i eq "";
+               $i="NOEXIST::FUNCTION:"
+                       if !defined($i) || $i eq "" || !defined($syms{$sym});
                printf OUT "%s%-40s%d\t%s\n","",$sym,$n,$i;
                if (exists $r{$sym}) {
                        (my $s, $i) = split /\\/,$r{$sym};
Unnamed repository; edit this file 'description' to name the repository.