2 files changed, 627 insertions, 0 deletions

diff --git a/src/lib/libcrypto/util/mkerr.pl b/src/lib/libcrypto/util/mkerr.pl
new file mode 100644
index 0000000000..4b3bccb13e
--- /dev/null
+++ b/src/lib/libcrypto/util/mkerr.pl
@@ -0,0 +1,503 @@
+#!/usr/local/bin/perl -w
+
+my $config = "crypto/err/openssl.ec";
+my $debug = 0;
+my $rebuild = 0;
+my $static = 1;
+my $recurse = 0;
+my $reindex = 0;
+my $dowrite = 0;
+
+
+while (@ARGV) {
+        my $arg = $ARGV[0];
+        if($arg eq "-conf") {
+                shift @ARGV;
+                $config = shift @ARGV;
+        } elsif($arg eq "-debug") {
+                $debug = 1;
+                shift @ARGV;
+        } elsif($arg eq "-rebuild") {
+                $rebuild = 1;
+                shift @ARGV;
+        } elsif($arg eq "-recurse") {
+                $recurse = 1;
+                shift @ARGV;
+        } elsif($arg eq "-reindex") {
+                $reindex = 1;
+                shift @ARGV;
+        } elsif($arg eq "-nostatic") {
+                $static = 0;
+                shift @ARGV;
+        } elsif($arg eq "-write") {
+                $dowrite = 1;
+                shift @ARGV;
+        } else {
+                last;
+        }
+}
+
+if($recurse) {
+        @source = (<crypto/*.c>, <crypto/*/*.c>, ,<rsaref/*.c>, <ssl/*.c>);
+} else {
+        @source = @ARGV;
+}
+
+# Read in the config file
+
+open(IN, "<$config") || die "Can't open config file $config";
+
+# Parse config file
+
+while(<IN>)
+{
+        if(/^L\s+(\S+)\s+(\S+)\s+(\S+)/) {
+                $hinc{$1} = $2;
+                $cskip{$3} = $1;
+                if($3 ne "NONE") {
+                        $csrc{$1} = $3;
+                        $fmax{$1} = 99;
+                        $rmax{$1} = 99;
+                        $fnew{$1} = 0;
+                        $rnew{$1} = 0;
+                }
+        } elsif (/^F\s+(\S+)/) {
+        # Add extra function with $1
+        } elsif (/^R\s+(\S+)\s+(\S+)/) {
+                $rextra{$1} = $2;
+                $rcodes{$1} = $2;
+        }
+}
+
+close IN;
+
+# Scan each header file in turn and make a list of error codes
+# and function names
+
+while (($lib, $hdr) = each %hinc)
+{
+        next if($hdr eq "NONE");
+        print STDERR "Scanning header file $hdr\n" if $debug; 
+        open(IN, "<$hdr") || die "Can't open Header file $hdr\n";
+        my $line = "", $def= "";
+        while(<IN>) {
+            last if(/BEGIN\s+ERROR\s+CODES/);
+            if ($line ne '') {
+                $_ = $line . $_;
+                $line = '';
+            }
+
+            if (/\\$/) {
+                $line = $_;
+                next;
+            }
+
+            $cpp = 1 if /^#.*ifdef.*cplusplus/;  # skip "C" declaration
+            if ($cpp) {
+                $cpp = 0 if /^#.*endif/;
+                next;
+            }
+
+            next if (/^#/);                      # skip preprocessor directives
+
+            s/\/\*.*?\*\///gs;                   # ignore comments
+            s/{[^{}]*}//gs;                      # ignore {} blocks
+
+            if (/{|\/\*/) { # Add a } so editor works...
+                $line = $_;
+            } else {
+                $def .= $_;
+            }
+        }
+
+        foreach (split /;/, $def) {
+            s/^[\n\s]*//g;
+            s/[\n\s]*$//g;
+            next if(/typedef\W/);
+            if (/\(\*(\w*)\([^\)]+/) {
+                my $name = $1;
+                $name =~ tr/[a-z]/[A-Z]/;
+                $ftrans{$name} = $1;
+            } elsif (/\w+\W+(\w+)\W*\(\s*\)$/s){
+                # K&R C
+                next ;
+            } elsif (/\w+\W+\w+\W*\(.*\)$/s) {
+                while (not /\(\)$/s) {
+                    s/[^\(\)]*\)$/\)/s;
+                    s/\([^\(\)]*\)\)$/\)/s;
+                }
+                s/\(void\)//;
+                /(\w+)\W*\(\)/s;
+                my $name = $1;
+                $name =~ tr/[a-z]/[A-Z]/;
+                $ftrans{$name} = $1;
+            } elsif (/\(/ and not (/=/ or /DECLARE_STACK/)) {
+                print STDERR "Header $hdr: cannot parse: $_;\n";
+            }
+        }
+
+        next if $reindex;
+
+        # Scan function and reason codes and store them: keep a note of the
+        # maximum code used.
+
+        while(<IN>) {
+                if(/^#define\s+(\S+)\s+(\S+)/) {
+                        $name = $1;
+                        $code = $2;
+                        unless($name =~ /^${lib}_([RF])_(\w+)$/) {
+                                print STDERR "Invalid error code $name\n";
+                                next;
+                        }
+                        if($1 eq "R") {
+                                $rcodes{$name} = $code;
+                                if(!(exists $rextra{$name}) &&
+                                         ($code > $rmax{$lib}) ) {
+                                        $rmax{$lib} = $code;
+                                }
+                        } else {
+                                if($code > $fmax{$lib}) {
+                                        $fmax{$lib} = $code;
+                                }
+                                $fcodes{$name} = $code;
+                        }
+                }
+        }
+        close IN;
+}
+
+# Scan each C source file and look for function and reason codes
+# This is done by looking for strings that "look like" function or
+# reason codes: basically anything consisting of all upper case and
+# numerics which has _F_ or _R_ in it and which has the name of an
+# error library at the start. This seems to work fine except for the
+# oddly named structure BIO_F_CTX which needs to be ignored.
+# If a code doesn't exist in list compiled from headers then mark it
+# with the value "X" as a place holder to give it a value later.
+# Store all function and reason codes found in %ufcodes and %urcodes
+# so all those unreferenced can be printed out.
+
+
+foreach $file (@source) {
+        # Don't parse the error source file.
+        next if exists $cskip{$file};
+        open(IN, "<$file") || die "Can't open source file $file\n";
+        while(<IN>) {
+                if(/(([A-Z0-9]+)_F_([A-Z0-9_]+))/) {
+                        next unless exists $csrc{$2};
+                        next if($1 eq "BIO_F_BUFFER_CTX");
+                        $ufcodes{$1} = 1;
+                        if(!exists $fcodes{$1}) {
+                                $fcodes{$1} = "X";
+                                $fnew{$2}++;
+                        }
+                        $notrans{$1} = 1 unless exists $ftrans{$3};
+                }
+                if(/(([A-Z0-9]+)_R_[A-Z0-9_]+)/) {
+                        next unless exists $csrc{$2};
+                        $urcodes{$1} = 1;
+                        if(!exists $rcodes{$1}) {
+                                $rcodes{$1} = "X";
+                                $rnew{$2}++;
+                        }
+                } 
+        }
+        close IN;
+}
+
+# Now process each library in turn.
+
+foreach $lib (keys %csrc)
+{
+        my $hfile = $hinc{$lib};
+        my $cfile = $csrc{$lib};
+        if(!$fnew{$lib} && !$rnew{$lib}) {
+                print STDERR "$lib:\t\tNo new error codes\n";
+                next unless $rebuild;
+        } else {
+                print STDERR "$lib:\t\t$fnew{$lib} New Functions,";
+                print STDERR " $rnew{$lib} New Reasons.\n";
+                next unless $dowrite;
+        }
+
+        # If we get here then we have some new error codes so we
+        # need to rebuild the header file and C file.
+
+        # Make a sorted list of error and reason codes for later use.
+
+        my @function = sort grep(/^${lib}_/,keys %fcodes);
+        my @reasons = sort grep(/^${lib}_/,keys %rcodes);
+
+        # Rewrite the header file
+
+        open(IN, "<$hfile") || die "Can't Open Header File $hfile\n";
+
+        # Copy across the old file
+        while(<IN>) {
+                push @out, $_;
+                last if (/BEGIN ERROR CODES/);
+        }
+        close IN;
+
+        open (OUT, ">$hfile") || die "Can't Open File $hfile for writing\n";
+
+        print OUT @out;
+        undef @out;
+        print OUT <<"EOF";
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
+/* Error codes for the $lib functions. */
+
+/* Function codes. */
+EOF
+
+        foreach $i (@function) {
+                $z=6-int(length($i)/8);
+                if($fcodes{$i} eq "X") {
+                        $fcodes{$i} = ++$fmax{$lib};
+                        print STDERR "New Function code $i\n" if $debug;
+                }
+                printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
+        }
+
+        print OUT "\n/* Reason codes. */\n";
+
+        foreach $i (@reasons) {
+                $z=6-int(length($i)/8);
+                if($rcodes{$i} eq "X") {
+                        $rcodes{$i} = ++$rmax{$lib};
+                        print STDERR "New Reason code   $i\n" if $debug;
+                }
+                printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
+        }
+        print OUT <<"EOF";
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
+
+EOF
+        close OUT;
+
+        # Rewrite the C source file containing the error details.
+
+        my $hincf;
+        if($static) {
+                $hfile =~ /([^\/]+)$/;
+                $hincf = "<openssl/$1>";
+        } else {
+                $hincf = "\"$hfile\"";
+        }
+
+
+        open (OUT,">$cfile") || die "Can't open $cfile for writing";
+
+        print OUT <<"EOF";
+/* $cfile */
+/* ====================================================================
+ * Copyright (c) 1999 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core\@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay\@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh\@cryptsoft.com).
+ *
+ */
+
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file.
+ */
+
+#include <stdio.h>
+#include <openssl/err.h>
+#include $hincf
+
+/* BEGIN ERROR CODES */
+#ifndef NO_ERR
+static ERR_STRING_DATA ${lib}_str_functs[]=
+        {
+EOF
+        # Add each function code: if a function name is found then use it.
+        foreach $i (@function) {
+                my $fn;
+                $i =~ /^${lib}_F_(\S+)$/;
+                $fn = $1;
+                if(exists $ftrans{$fn}) {
+                        $fn = $ftrans{$fn};
+                }
+                print OUT "{ERR_PACK(0,$i,0),\t\"$fn\"},\n";
+        }
+        print OUT <<"EOF";
+{0,NULL}
+        };
+
+static ERR_STRING_DATA ${lib}_str_reasons[]=
+        {
+EOF
+        # Add each reason code.
+        foreach $i (@reasons) {
+                my $rn;
+                my $nspc = 0;
+                $i =~ /^${lib}_R_(\S+)$/;
+                $rn = $1;
+                $rn =~ tr/_[A-Z]/ [a-z]/;
+                $nspc = 40 - length($i) unless length($i) > 40;
+                $nspc = " " x $nspc;
+                print OUT "{${i}${nspc},\"$rn\"},\n";
+        }
+if($static) {
+        print OUT <<"EOF";
+{0,NULL}
+        };
+
+#endif
+
+void ERR_load_${lib}_strings(void)
+        {
+        static int init=1;
+
+        if (init)
+                {
+                init=0;
+#ifndef NO_ERR
+                ERR_load_strings(ERR_LIB_${lib},${lib}_str_functs);
+                ERR_load_strings(ERR_LIB_${lib},${lib}_str_reasons);
+#endif
+
+                }
+        }
+EOF
+} else {
+        print OUT <<"EOF";
+{0,NULL}
+        };
+
+#endif
+
+#ifdef ${lib}_LIB_NAME
+static ERR_STRING_DATA ${lib}_lib_name[]=
+        {
+{0      ,${lib}_LIB_NAME},
+{0,NULL}
+        };
+#endif
+
+
+int ${lib}_lib_error_code=0;
+
+void ERR_load_${lib}_strings(void)
+        {
+        static int init=1;
+
+        if (${lib}_lib_error_code == 0)
+                ${lib}_lib_error_code=ERR_get_next_error_library();
+
+        if (init)
+                {
+                init=0;
+#ifndef NO_ERR
+                ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
+                ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
+#endif
+
+#ifdef ${lib}_LIB_NAME
+                ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
+                ERR_load_strings(0,${lib}_lib_name);
+#endif;
+                }
+        }
+
+void ERR_${lib}_error(int function, int reason, char *file, int line)
+        {
+        if (${lib}_lib_error_code == 0)
+                ${lib}_lib_error_code=ERR_get_next_error_library();
+        ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
+        }
+EOF
+
+}
+
+        close OUT;
+
+}
+
+if($debug && defined(%notrans)) {
+        print STDERR "The following function codes were not translated:\n";
+        foreach(sort keys %notrans)
+        {
+                print STDERR "$_\n";
+        }
+}
+
+# Make a list of unreferenced function and reason codes
+
+foreach (keys %fcodes) {
+        push (@funref, $_) unless exists $ufcodes{$_};
+}
+
+foreach (keys %rcodes) {
+        push (@runref, $_) unless exists $urcodes{$_};
+}
+
+if($debug && defined(@funref) ) {
+        print STDERR "The following function codes were not referenced:\n";
+        foreach(sort @funref)
+        {
+                print STDERR "$_\n";
+        }
+}
+
+if($debug && defined(@runref) ) {
+        print STDERR "The following reason codes were not referenced:\n";
+        foreach(sort @runref)
+        {
+                print STDERR "$_\n";
+        }
+}
diff --git a/src/lib/libcrypto/util/mkstack.pl b/src/lib/libcrypto/util/mkstack.pl
new file mode 100644
index 0000000000..3ee13fe7c9
--- /dev/null
+++ b/src/lib/libcrypto/util/mkstack.pl
@@ -0,0 +1,124 @@
+#!/usr/local/bin/perl -w
+
+# This is a utility that searches out "DECLARE_STACK_OF()"
+# declarations in .h and .c files, and updates/creates/replaces
+# the corresponding macro declarations in crypto/stack/safestack.h.
+# As it's not generally possible to have macros that generate macros,
+# we need to control this from the "outside", here in this script.
+#
+# Geoff Thorpe, June, 2000 (with massive Perl-hacking
+#                           help from Steve Robb)
+
+my $safestack = "crypto/stack/safestack";
+
+my $do_write;
+while (@ARGV) {
+        my $arg = $ARGV[0];
+        if($arg eq "-write") {
+                $do_write = 1;
+        }
+        shift @ARGV;
+}
+
+
+@source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <rsaref/*.[ch]>, <ssl/*.[ch]>);
+foreach $file (@source) {
+        next if -l $file;
+
+        # Open the .c/.h file for reading
+        open(IN, "< $file") || die "Can't open $file for reading: $!";
+
+        while(<IN>) {
+                if (/^DECLARE_STACK_OF\(([^)]+)\)/) {
+                        push @stacklst, $1;
+                } if (/^DECLARE_ASN1_SET_OF\(([^)]+)\)/) {
+                        push @asn1setlst, $1;
+                } if (/^DECLARE_PKCS12_STACK_OF\(([^)]+)\)/) {
+                        push @p12stklst, $1;
+                }
+        }
+        close(IN);
+}
+
+
+
+my $old_stackfile = "";
+my $new_stackfile = "";
+my $inside_block = 0;
+my $type_thing;
+
+open(IN, "< $safestack.h") || die "Can't open input file: $!";
+while(<IN>) {
+        $old_stackfile .= $_;
+
+        if (m|^/\* This block of defines is updated by util/mkstack.pl, please do not touch! \*/|) {
+                $inside_block = 1;
+        }
+        if (m|^/\* End of util/mkstack.pl block, you may now edit :-\) \*/|) {
+                $inside_block = 0;
+        } elsif ($inside_block == 0) {
+                $new_stackfile .= $_;
+        }
+        next if($inside_block != 1);
+        $new_stackfile .= "/* This block of defines is updated by util/mkstack.pl, please do not touch! */";
+                
+        foreach $type_thing (sort @stacklst) {
+                $new_stackfile .= <<EOF;
+
+#define sk_${type_thing}_new(st) SKM_sk_new($type_thing, (st))
+#define sk_${type_thing}_new_null() SKM_sk_new_null($type_thing)
+#define sk_${type_thing}_free(st) SKM_sk_free($type_thing, (st))
+#define sk_${type_thing}_num(st) SKM_sk_num($type_thing, (st))
+#define sk_${type_thing}_value(st, i) SKM_sk_value($type_thing, (st), (i))
+#define sk_${type_thing}_set(st, i, val) SKM_sk_set($type_thing, (st), (i), (val))
+#define sk_${type_thing}_zero(st) SKM_sk_zero($type_thing, (st))
+#define sk_${type_thing}_push(st, val) SKM_sk_push($type_thing, (st), (val))
+#define sk_${type_thing}_unshift(st, val) SKM_sk_unshift($type_thing, (st), (val))
+#define sk_${type_thing}_find(st, val) SKM_sk_find($type_thing, (st), (val))
+#define sk_${type_thing}_delete(st, i) SKM_sk_delete($type_thing, (st), (i))
+#define sk_${type_thing}_delete_ptr(st, ptr) SKM_sk_delete_ptr($type_thing, (st), (ptr))
+#define sk_${type_thing}_insert(st, val, i) SKM_sk_insert($type_thing, (st), (val), (i))
+#define sk_${type_thing}_set_cmp_func(st, cmp) SKM_sk_set_cmp_func($type_thing, (st), (cmp))
+#define sk_${type_thing}_dup(st) SKM_sk_dup($type_thing, st)
+#define sk_${type_thing}_pop_free(st, free_func) SKM_sk_pop_free($type_thing, (st), (free_func))
+#define sk_${type_thing}_shift(st) SKM_sk_shift($type_thing, (st))
+#define sk_${type_thing}_pop(st) SKM_sk_pop($type_thing, (st))
+#define sk_${type_thing}_sort(st) SKM_sk_sort($type_thing, (st))
+EOF
+        }
+        foreach $type_thing (sort @asn1setlst) {
+                $new_stackfile .= <<EOF;
+
+#define d2i_ASN1_SET_OF_${type_thing}(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \\
+        SKM_ASN1_SET_OF_d2i($type_thing, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
+#define i2d_ASN1_SET_OF_${type_thing}(st, pp, i2d_func, ex_tag, ex_class, is_set) \\
+        SKM_ASN1_SET_OF_i2d($type_thing, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
+#define ASN1_seq_pack_${type_thing}(st, i2d_func, buf, len) \\
+        SKM_ASN1_seq_pack($type_thing, (st), (i2d_func), (buf), (len))
+#define ASN1_seq_unpack_${type_thing}(buf, len, d2i_func, free_func) \\
+        SKM_ASN1_seq_unpack($type_thing, (buf), (len), (d2i_func), (free_func))
+EOF
+        }
+        foreach $type_thing (sort @p12stklst) {
+                $new_stackfile .= <<EOF;
+
+#define PKCS12_decrypt_d2i_${type_thing}(algor, d2i_func, free_func, pass, passlen, oct, seq) \\
+        SKM_PKCS12_decrypt_d2i($type_thing, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
+EOF
+        }
+        $new_stackfile .= "/* End of util/mkstack.pl block, you may now edit :-) */\n";
+        $inside_block = 2;
+}
+
+
+if ($new_stackfile eq $old_stackfile) {
+        print "No changes to $safestack.h.\n";
+        exit 0; # avoid unnecessary rebuild
+}
+
+if ($do_write) {
+        print "Writing new $safestack.h.\n";
+        open OUT, ">$safestack.h" || die "Can't open output file";
+        print OUT $new_stackfile;
+        close OUT;
+}