Sync ordinals with stable branch.

[openssl.git] / util / mkerr.pl

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 030899b7ab449f6cbfac737ef758477c4d1046d1..2a9ddcb6f411595121fa90a116e481e90f477080 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -1,6 +1,7 @@
 #!/usr/local/bin/perl -w
 
 my $config = "crypto/err/openssl.ec";
+my $hprefix = "openssl/";
 my $debug = 0;
 my $rebuild = 0;
 my $static = 1;
@@ -12,11 +13,16 @@ my $staticloader = "";
 my $pack_errcode;
 my $load_errcode;
 
+my $errcount;
+
 while (@ARGV) {
        my $arg = $ARGV[0];
        if($arg eq "-conf") {
                shift @ARGV;
                $config = shift @ARGV;
+       } elsif($arg eq "-hprefix") {
+               shift @ARGV;
+               $hprefix = shift @ARGV;
        } elsif($arg eq "-debug") {
                $debug = 1;
                shift @ARGV;
@@ -65,6 +71,8 @@ while(<IN>)
                        $csrc{$1} = $3;
                        $fmax{$1} = 99;
                        $rmax{$1} = 99;
+                       $fassigned{$1} = ":";
+                       $rassigned{$1} = ":";
                        $fnew{$1} = 0;
                        $rnew{$1} = 0;
                }
@@ -133,6 +141,8 @@ while (($hdr, $lib) = each %libinc)
 
        print STDERR "                                  \r" if $debug;
         $defnr = 0;
+       # Delete any DECLARE_ macros
+       $def =~ s/DECLARE_\w+\([\w,\s]+\)//gs;
        foreach (split /;/, $def) {
            $defnr++;
            print STDERR "def: $defnr\r" if $debug;
@@ -145,6 +155,9 @@ while (($hdr, $lib) = each %libinc)
            # Skip over recognized non-function declarations
            next if(/typedef\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/);
 
+           # Remove STACK_OF(foo)
+           s/STACK_OF\(\w+\)/void/;
+
            # Reduce argument lists to empty ()
            # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}
            while(/\(.*\)/s) {
@@ -171,7 +184,7 @@ while (($hdr, $lib) = each %libinc)
        # maximum code used.
 
        if ($gotfile) {
-           while(<IN>) {
+         while(<IN>) {
                if(/^\#define\s+(\S+)\s+(\S+)/) {
                        $name = $1;
                        $code = $2;
@@ -182,18 +195,52 @@ while (($hdr, $lib) = each %libinc)
                        }
                        if($1 eq "R") {
                                $rcodes{$name} = $code;
+                               if ($rassigned{$lib} =~ /:$code:/) {
+                                       print STDERR "!! ERROR: $lib reason code $code assigned twice\n";
+                                       ++$errcount;
+                               }
+                               $rassigned{$lib} .= "$code:";
                                if(!(exists $rextra{$name}) &&
                                         ($code > $rmax{$lib}) ) {
                                        $rmax{$lib} = $code;
                                }
                        } else {
+                               if ($fassigned{$lib} =~ /:$code:/) {
+                                       print STDERR "!! ERROR: $lib function code $code assigned twice\n";
+                                       ++$errcount;
+                               }
+                               $fassigned{$lib} .= "$code:";
                                if($code > $fmax{$lib}) {
                                        $fmax{$lib} = $code;
                                }
                                $fcodes{$name} = $code;
                        }
                }
-           }
+         }
+       }
+
+       if ($debug) {
+               if (defined($fmax{$lib})) {
+                       print STDERR "Max function code fmax" . "{" . "$lib" . "} = $fmax{$lib}\n";
+                       $fassigned{$lib} =~ m/^:(.*):$/;
+                       @fassigned = sort {$a <=> $b} split(":", $1);
+                       print STDERR "  @fassigned\n";
+               }
+               if (defined($rmax{$lib})) {
+                       print STDERR "Max reason code rmax" . "{" . "$lib" . "} = $rmax{$lib}\n";
+                       $rassigned{$lib} =~ m/^:(.*):$/;
+                       @rassigned = sort {$a <=> $b} split(":", $1);
+                       print STDERR "  @rassigned\n";
+               }
+       }
+
+       if ($lib eq "SSL") {
+               if ($rmax{$lib} >= 1000) {
+                       print STDERR "!! ERROR: SSL error codes 1000+ are reserved for alerts.\n";
+                       print STDERR "!!        Any new alerts must be added to $config.\n";
+                       ++$errcount;
+                       print STDERR "\n";
+               }
        }
        close IN;
 }
@@ -237,7 +284,7 @@ foreach $file (@source) {
        }
        close IN;
 }
-print STDERR "\n" if $debug;
+print STDERR "                                  \n" if $debug;
 
 # Now process each library in turn.
 
@@ -274,7 +321,7 @@ foreach $lib (keys %csrc)
        } else {
            push @out,
 "/* ====================================================================\n",
-" * Copyright (c) 2001-2005 The OpenSSL Project.  All rights reserved.\n",
+" * Copyright (c) 2001-2008 The OpenSSL Project.  All rights reserved.\n",
 " *\n",
 " * Redistribution and use in source and binary forms, with or without\n",
 " * modification, are permitted provided that the following conditions\n",
@@ -330,6 +377,10 @@ foreach $lib (keys %csrc)
 "#ifndef HEADER_${lib}_ERR_H\n",
 "#define HEADER_${lib}_ERR_H\n",
 "\n",
+"#ifdef  __cplusplus\n",
+"extern \"C\" {\n",
+"#endif\n",
+"\n",
 "/* BEGIN ERROR CODES */\n";
        }
        open (OUT, ">$hfile") || die "Can't Open File $hfile for writing\n";
@@ -364,7 +415,16 @@ EOF
        foreach $i (@function) {
                $z=6-int(length($i)/8);
                if($fcodes{$i} eq "X") {
-                       $fcodes{$i} = ++$fmax{$lib};
+                       $fassigned{$lib} =~ m/^:([^:]*):/;
+                       $findcode = $1;
+                       if (!defined($findcode)) {
+                               $findcode = $fmax{$lib};
+                       }
+                       while ($fassigned{$lib} =~ m/:$findcode:/) {
+                               $findcode++;
+                       }
+                       $fcodes{$i} = $findcode;
+                       $fassigned{$lib} .= "$findcode:";
                        print STDERR "New Function code $i\n" if $debug;
                }
                printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
@@ -375,7 +435,16 @@ EOF
        foreach $i (@reasons) {
                $z=6-int(length($i)/8);
                if($rcodes{$i} eq "X") {
-                       $rcodes{$i} = ++$rmax{$lib};
+                       $rassigned{$lib} =~ m/^:([^:]*):/;
+                       $findcode = $1;
+                       if (!defined($findcode)) {
+                               $findcode = $rmax{$lib};
+                       }
+                       while ($rassigned{$lib} =~ m/:$findcode:/) {
+                               $findcode++;
+                       }
+                       $rcodes{$i} = $findcode;
+                       $rassigned{$lib} .= "$findcode:";
                        print STDERR "New Reason code   $i\n" if $debug;
                }
                printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
@@ -398,14 +467,21 @@ EOF
                        if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) {
                                $err_reason_strings{$1} = $2;
                        }
+                       if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) {
+                               if (!exists $ftrans{$1} && ($1 ne $2)) {
+                                       print STDERR "WARNING: Mismatched function string $2\n";
+                                       $ftrans{$1} = $2;
+                               }
+                       }
                }
                close(IN);
        }
 
+
        my $hincf;
        if($static) {
                $hfile =~ /([^\/]+)$/;
-               $hincf = "<openssl/$1>";
+               $hincf = "<${hprefix}$1>";
        } else {
                $hincf = "\"$hfile\"";
        }
@@ -430,7 +506,7 @@ EOF
        print OUT <<"EOF";
 /* $cfile */
 /* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -544,17 +620,14 @@ if($static) {
 
 ${staticloader}void ERR_load_${lib}_strings(void)
        {
-       static int init=1;
+#ifndef OPENSSL_NO_ERR
 
-       if (init)
+       if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)
                {
-               init=0;
-#ifndef OPENSSL_NO_ERR
                ERR_load_strings($load_errcode,${lib}_str_functs);
                ERR_load_strings($load_errcode,${lib}_str_reasons);
-#endif
-
                }
+#endif
        }
 EOF
 } else {
@@ -659,3 +732,9 @@ if($debug && defined(@runref) ) {
                print STDERR "$_\n";
        }
 }
+
+if($errcount) {
+       print STDERR "There were errors, failing...\n\n";
+       exit $errcount;
+}
+