projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
By default, allow SCT timestamps to be up to 5 minutes in the future
[oweals/openssl.git]
/
util
/
mkerr.pl
diff --git
a/util/mkerr.pl
b/util/mkerr.pl
index fd5e774e74b669102fda0e1fb0ef40220d9974e2..79c8cfc31c4365afc38de6c7b21c0ce55e1502e7 100644
(file)
--- a/
util/mkerr.pl
+++ b/
util/mkerr.pl
@@
-7,7
+7,6
@@
# https://www.openssl.org/source/license.html
my $config = "crypto/err/openssl.ec";
# https://www.openssl.org/source/license.html
my $config = "crypto/err/openssl.ec";
-my $hprefix = "openssl/";
my $debug = 0;
my $unref = 0;
my $rebuild = 0;
my $debug = 0;
my $unref = 0;
my $rebuild = 0;
@@
-16,6
+15,8
@@
my $recurse = 0;
my $reindex = 0;
my $dowrite = 0;
my $staticloader = "";
my $reindex = 0;
my $dowrite = 0;
my $staticloader = "";
+my @t = localtime();
+my $YEAR = @t[5] + 1900;
my $pack_errcode;
my $load_errcode;
my $pack_errcode;
my $load_errcode;
@@
-68,6
+69,8
@@
Options:
-hprefix P Prepend the filenames in generated #include <header>
statements with prefix P. Default: 'openssl/' (without
the quotes, naturally)
-hprefix P Prepend the filenames in generated #include <header>
statements with prefix P. Default: 'openssl/' (without
the quotes, naturally)
+ NOTE: not used any more because our include directory
+ structure has changed.
-debug Turn on debugging verbose output on stderr.
-debug Turn on debugging verbose output on stderr.
@@
-171,8
+174,8
@@
close IN;
while (($hdr, $lib) = each %libinc)
{
next if($hdr eq "NONE");
while (($hdr, $lib) = each %libinc)
{
next if($hdr eq "NONE");
- print STDERR "Scanning header file $hdr\n" if $debug;
- my $line = "", $def= "", $linenr = 0, $gotfile = 0;
+ print STDERR "Scanning header file $hdr\n" if $debug;
+ my $line = "", $def= "", $linenr = 0, $gotfile = 0
, $cpp = 0
;
if (open(IN, "<$hdr")) {
$gotfile = 1;
while(<IN>) {
if (open(IN, "<$hdr")) {
$gotfile = 1;
while(<IN>) {
@@
-407,17
+410,24
@@
foreach $lib (keys %csrc)
# Rewrite the header file
# Rewrite the header file
+ $cpp = 0;
+ $cplusplus = 0;
if (open(IN, "<$hfile")) {
# Copy across the old file
while(<IN>) {
if (open(IN, "<$hfile")) {
# Copy across the old file
while(<IN>) {
+ $cplusplus = $cpp if /^#.*ifdef.*cplusplus/;
+ $cpp++ if /^#\s*if/;
+ $cpp-- if /^#\s*endif/;
push @out, $_;
last if (/BEGIN ERROR CODES/);
}
close IN;
} else {
push @out, $_;
last if (/BEGIN ERROR CODES/);
}
close IN;
} else {
+ $cpp = 1;
+ $cplusplus = 1;
push @out,
"/*\n",
push @out,
"/*\n",
-" * Copyright 1995-
2016
The OpenSSL Project Authors. All Rights Reserved.\n",
+" * Copyright 1995-
$YEAR
The OpenSSL Project Authors. All Rights Reserved.\n",
" *\n",
" * Licensed under the OpenSSL license (the \"License\"). You may not use\n",
" * this file except in compliance with the License. You can obtain a copy\n",
" *\n",
" * Licensed under the OpenSSL license (the \"License\"). You may not use\n",
" * this file except in compliance with the License. You can obtain a copy\n",
@@
-426,11
+436,11
@@
foreach $lib (keys %csrc)
" */\n",
"\n",
"#ifndef HEADER_${lib}_ERR_H\n",
" */\n",
"\n",
"#ifndef HEADER_${lib}_ERR_H\n",
-"#define HEADER_${lib}_ERR_H\n",
+"#
define HEADER_${lib}_ERR_H\n",
"\n",
"\n",
-"#ifdef __cplusplus\n",
+"#
ifdef __cplusplus\n",
"extern \"C\" {\n",
"extern \"C\" {\n",
-"#endif\n",
+"#
endif\n",
"\n",
"/* BEGIN ERROR CODES */\n";
}
"\n",
"/* BEGIN ERROR CODES */\n";
}
@@
-443,15
+453,16
@@
foreach $lib (keys %csrc)
* 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.
*/
* 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.
*/
+
EOF
if($static) {
print OUT <<"EOF";
EOF
if($static) {
print OUT <<"EOF";
-${staticloader}
void
ERR_load_${lib}_strings(void);
+${staticloader}
int
ERR_load_${lib}_strings(void);
EOF
} else {
print OUT <<"EOF";
EOF
} else {
print OUT <<"EOF";
-${staticloader}
void
ERR_load_${lib}_strings(void);
+${staticloader}
int
ERR_load_${lib}_strings(void);
${staticloader}void ERR_unload_${lib}_strings(void);
${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
# define ${lib}err(f,r) ERR_${lib}_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)
${staticloader}void ERR_unload_${lib}_strings(void);
${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
# define ${lib}err(f,r) ERR_${lib}_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)
@@
-503,11
+514,17
@@
EOF
}
print OUT <<"EOF";
}
print OUT <<"EOF";
-#ifdef __cplusplus
-}
-#endif
-#endif
EOF
EOF
+ do {
+ if ($cplusplus == $cpp) {
+ print OUT "#", " "x$cpp, "ifdef __cplusplus\n";
+ print OUT "}\n";
+ print OUT "#", " "x$cpp, "endif\n";
+ }
+ if ($cpp-- > 0) {
+ print OUT "#", " "x$cpp, "endif\n";
+ }
+ } while ($cpp);
close OUT;
# Rewrite the C source file containing the error details.
close OUT;
# Rewrite the C source file containing the error details.
@@
-539,8
+556,13
@@
EOF
my $hincf;
if($static) {
my $hincf;
if($static) {
- $hfile =~ /([^\/]+)$/;
- $hincf = "<${hprefix}$1>";
+ $hincf = $hfile;
+ $hincf =~ s|.*include/||;
+ if ($hincf =~ m|^openssl/|) {
+ $hincf = "<${hincf}>";
+ } else {
+ $hincf = "\"${hincf}\"";
+ }
} else {
$hincf = "\"$hfile\"";
}
} else {
$hincf = "\"$hfile\"";
}
@@
-564,18
+586,13
@@
EOF
print OUT <<"EOF";
/*
print OUT <<"EOF";
/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Generated by util/mkerr.pl DO NOT EDIT
+ * Copyright 1995-$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
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
-*/
-
-/*
- * 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,
- * only reason strings will be preserved.
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-599,7
+616,7
@@
EOF
$fn = $ftrans{$fn};
}
# print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
$fn = $ftrans{$fn};
}
# print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
- if(length($i) + length($fn) > 5
8
) {
+ if(length($i) + length($fn) > 5
7
) {
print OUT " {ERR_FUNC($i),\n \"$fn\"},\n";
} else {
print OUT " {ERR_FUNC($i), \"$fn\"},\n";
print OUT " {ERR_FUNC($i),\n \"$fn\"},\n";
} else {
print OUT " {ERR_FUNC($i), \"$fn\"},\n";
@@
-622,7
+639,7
@@
EOF
$rn = $1;
$rn =~ tr/_[A-Z]/ [a-z]/;
}
$rn = $1;
$rn =~ tr/_[A-Z]/ [a-z]/;
}
- if(length($i) + length($rn) > 5
6
) {
+ if(length($i) + length($rn) > 5
5
) {
print OUT " {${rstr},\n \"$rn\"},\n";
} else {
print OUT " {${rstr}, \"$rn\"},\n";
print OUT " {${rstr},\n \"$rn\"},\n";
} else {
print OUT " {${rstr}, \"$rn\"},\n";
@@
-635,7
+652,7
@@
if($static) {
#endif
#endif
-${staticloader}
void
ERR_load_${lib}_strings(void)
+${staticloader}
int
ERR_load_${lib}_strings(void)
{
#ifndef OPENSSL_NO_ERR
{
#ifndef OPENSSL_NO_ERR
@@
-644,6
+661,7
@@
${staticloader}void ERR_load_${lib}_strings(void)
ERR_load_strings($load_errcode, ${lib}_str_reasons);
}
#endif
ERR_load_strings($load_errcode, ${lib}_str_reasons);
}
#endif
+ return 1;
}
EOF
} else {
}
EOF
} else {
@@
-663,7
+681,7
@@
static ERR_STRING_DATA ${lib}_lib_name[] = {
static int ${lib}_lib_error_code = 0;
static int ${lib}_error_init = 1;
static int ${lib}_lib_error_code = 0;
static int ${lib}_error_init = 1;
-${staticloader}
void
ERR_load_${lib}_strings(void)
+${staticloader}
int
ERR_load_${lib}_strings(void)
{
if (${lib}_lib_error_code == 0)
${lib}_lib_error_code = ERR_get_next_error_library();
{
if (${lib}_lib_error_code == 0)
${lib}_lib_error_code = ERR_get_next_error_library();
@@
-680,6
+698,7
@@
${staticloader}void ERR_load_${lib}_strings(void)
ERR_load_strings(0, ${lib}_lib_name);
#endif
}
ERR_load_strings(0, ${lib}_lib_name);
#endif
}
+ return 1;
}
${staticloader}void ERR_unload_${lib}_strings(void)
}
${staticloader}void ERR_unload_${lib}_strings(void)