RAND_pseudo_bytes is good enough for encryption IVs,

[openssl.git] / util / mkerr.pl

diff --git a/util/mkerr.pl b/util/mkerr.pl
index ccf766b9a04156bcc66bb9dc66ad3473ff75a96e..ebc059ef228382cc1d48e148d0dfdcbf1825d102 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -66,7 +66,6 @@ while(<IN>)
        } elsif (/^R\s+(\S+)\s+(\S+)/) {
                $rextra{$1} = $2;
                $rcodes{$1} = $2;
        } elsif (/^R\s+(\S+)\s+(\S+)/) {
                $rextra{$1} = $2;
                $rcodes{$1} = $2;

-       # Add extra reason with $1, value $2

        }
 }
 
        }
 }
 


@@ -114,20 +113,24 @@ while (($lib, $hdr) = each %hinc)
        foreach (split /;/, $def) {
            s/^[\n\s]*//g;
            s/[\n\s]*$//g;
        foreach (split /;/, $def) {
            s/^[\n\s]*//g;
            s/[\n\s]*$//g;

-           next if (/\w+\W+(\w+)\W*\(\s*\)$/s); # K&R C
-           next if (/\(\*(\w*)\([^\)]+/);
-           if (/\w+\W+\w+\W*\(.*\)$/s) {
+           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;
                while (not /\(\)$/s) {
                    s/[^\(\)]*\)$/\)/s;
                    s/\([^\(\)]*\)\)$/\)/s;
                }
                s/\(void\)//;
                /(\w+)\W*\(\)/s;

-               next if(/typedef\W/);

                my $name = $1;
                $name =~ tr/[a-z]/[A-Z]/;
                $ftrans{$name} = $1;
                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";
            }
            } elsif (/\(/ and not (/=/ or /DECLARE_STACK/)) {
                print STDERR "Header $hdr: cannot parse: $_;\n";
            }


@@ -281,8 +284,14 @@ EOF
 
        # Rewrite the C source file containing the error details.
 
 
        # Rewrite the C source file containing the error details.
 

-       $hfile =~ /([^\/]+)$/;
-       my $hincf = $1;
+       my $hincf;
+       if($static) {
+               $hfile =~ /([^\/]+)$/;
+               $hincf = "<openssl/$1>";
+       } else {
+               $hincf = "\"$hfile\"";
+       }
+

 
        open (OUT,">$cfile") || die "Can't open $cfile for writing";
 
 
        open (OUT,">$cfile") || die "Can't open $cfile for writing";
 


@@ -348,7 +357,7 @@ EOF
 
 #include <stdio.h>
 #include <openssl/err.h>
 
 #include <stdio.h>
 #include <openssl/err.h>

-#include <openssl/$hincf>
+#include $hincf

 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR


@@ -441,7 +450,7 @@ void ERR_load_${lib}_strings(void)
 #ifdef ${lib}_LIB_NAME
                ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
                ERR_load_strings(0,${lib}_lib_name);
 #ifdef ${lib}_LIB_NAME
                ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
                ERR_load_strings(0,${lib}_lib_name);

-#endif;
+#endif

                }
        }
 
                }
        }