projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: clarify the 'random number generator must be seeded' requirement
[oweals/openssl.git]
/
util
/
mkerr.pl
diff --git
a/util/mkerr.pl
b/util/mkerr.pl
index 6bc27c498b32b0fa2ec48172e797b4a598faa57a..0ea02961a5fdea9bb0427eacd97a4035e97f623a 100755
(executable)
--- a/
util/mkerr.pl
+++ b/
util/mkerr.pl
@@
-1,5
+1,5
@@
#! /usr/bin/env perl
#! /usr/bin/env perl
-# Copyright 1999-201
6
The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-201
8
The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
@@
-9,6
+9,9
@@
use strict;
use warnings;
use strict;
use warnings;
+use lib ".";
+use configdata;
+
my $config = "crypto/err/openssl.ec";
my $debug = 0;
my $internal = 0;
my $config = "crypto/err/openssl.ec";
my $debug = 0;
my $internal = 0;
@@
-430,6
+433,9
@@
foreach my $lib ( keys %errorfile ) {
my @function = sort grep( /^${lib}_/, keys %fcodes );
my @reasons = sort grep( /^${lib}_/, keys %rcodes );
my @function = sort grep( /^${lib}_/, keys %fcodes );
my @reasons = sort grep( /^${lib}_/, keys %rcodes );
+ # indent level for innermost preprocessor lines
+ my $indent = " ";
+
# Rewrite the header file
my $hfile = $hinc{$lib};
# Rewrite the header file
my $hfile = $hinc{$lib};
@@
-453,14
+459,21
@@
EOF
if ( $internal ) {
# Declare the load function because the generate C file
# includes "fooerr.h" not "foo.h"
if ( $internal ) {
# Declare the load function because the generate C file
# includes "fooerr.h" not "foo.h"
+ if ($lib ne "SSL" && $lib ne "ASYNC"
+ && grep { $lib eq uc $_ } @disablables) {
+ print OUT <<"EOF";
+# include <openssl/opensslconf.h>
+
+# ifndef OPENSSL_NO_${lib}
+
+EOF
+ $indent = " ";
+ }
print OUT <<"EOF";
print OUT <<"EOF";
-#
ifdef __cplusplus
-extern \"C\"
{
-#
endif
+#
${indent}
ifdef __cplusplus
+extern \"C\"
+#
${indent}
endif
int ERR_load_${lib}_strings(void);
int ERR_load_${lib}_strings(void);
-# ifdef __cplusplus
-}
-# endif
EOF
} else {
print OUT <<"EOF";
EOF
} else {
print OUT <<"EOF";
@@
-486,6
+499,7
@@
EOF
print OUT "\n/*\n * $lib function codes.\n */\n";
foreach my $i ( @function ) {
my $z = 48 - length($i);
print OUT "\n/*\n * $lib function codes.\n */\n";
foreach my $i ( @function ) {
my $z = 48 - length($i);
+ $z = 0 if $z < 0;
if ( $fcodes{$i} eq "X" ) {
$fassigned{$lib} =~ m/^:([^:]*):/;
my $findcode = $1;
if ( $fcodes{$i} eq "X" ) {
$fassigned{$lib} =~ m/^:([^:]*):/;
my $findcode = $1;
@@
-497,12
+511,13
@@
EOF
$fassigned{$lib} .= "$findcode:";
print STDERR "New Function code $i\n" if $debug;
}
$fassigned{$lib} .= "$findcode:";
print STDERR "New Function code $i\n" if $debug;
}
- printf OUT "#
define $i%s $fcodes{$i}\n", " " x $z;
+ printf OUT "#
${indent}
define $i%s $fcodes{$i}\n", " " x $z;
}
print OUT "\n/*\n * $lib reason codes.\n */\n";
foreach my $i ( @reasons ) {
my $z = 48 - length($i);
}
print OUT "\n/*\n * $lib reason codes.\n */\n";
foreach my $i ( @reasons ) {
my $z = 48 - length($i);
+ $z = 0 if $z < 0;
if ( $rcodes{$i} eq "X" ) {
$rassigned{$lib} =~ m/^:([^:]*):/;
my $findcode = $1;
if ( $rcodes{$i} eq "X" ) {
$rassigned{$lib} =~ m/^:([^:]*):/;
my $findcode = $1;
@@
-514,11
+529,14
@@
EOF
$rassigned{$lib} .= "$findcode:";
print STDERR "New Reason code $i\n" if $debug;
}
$rassigned{$lib} .= "$findcode:";
print STDERR "New Reason code $i\n" if $debug;
}
- printf OUT "#
define $i%s $rcodes{$i}\n", " " x $z;
+ printf OUT "#
${indent}
define $i%s $rcodes{$i}\n", " " x $z;
}
print OUT "\n";
}
print OUT "\n";
- print OUT "#endif\n";
+ while (length($indent) > 0) {
+ $indent = substr $indent, 0, -1;
+ print OUT "#${indent}endif\n";
+ }
# Rewrite the C source file containing the error details.
# Rewrite the C source file containing the error details.
@@
-700,7
+718,7
@@
if ( $newstate ) {
open(OUT, ">$statefile.new")
|| die "Can't write $statefile.new, $!";
print OUT <<"EOF";
open(OUT, ">$statefile.new")
|| die "Can't write $statefile.new, $!";
print OUT <<"EOF";
-# Copyright 1999-
2017
The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-
$YEAR
The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy