#! /usr/bin/env perl
-# Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
#
-# Licensed under the OpenSSL license (the "License"). You may not use
+# Licensed under the Apache License 2.0 (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
use strict;
use warnings;
+use lib ".";
+use configdata;
+
my $config = "crypto/err/openssl.ec";
my $debug = 0;
my $internal = 0;
my $reindex = 0;
my $static = 0;
my $unref = 0;
+my %modules = ();
my $errors = 0;
my @t = localtime();
-internal Generate code that is to be built as part of OpenSSL itself.
Also scans internal list of files.
+ -module M Only useful with -internal!
+ Only write files for library module M. Whether files are
+ actually written or not depends on other options, such as
+ -rebuild.
+ Note: this option is cumulative. If not given at all, all
+ internal modules will be considered.
+
-nowrite Do not write the header/source files, even if changed.
-rebuild Rebuild all header and C source files, even if there
} elsif ( $arg eq "-unref" ) {
$unref = 1;
$nowrite = 1;
+ } elsif ( $arg eq "-module" ) {
+ shift @ARGV;
+ $modules{uc $ARGV[0]} = 1;
} elsif ( $arg =~ /-*h(elp)?/ ) {
&help();
exit;
die "Cannot mix -internal and -static\n" if $static;
die "Extra parameters given.\n" if @ARGV;
@source = ( glob('crypto/*.c'), glob('crypto/*/*.c'),
- glob('ssl/*.c'), glob('ssl/*/*.c') );
+ glob('ssl/*.c'), glob('ssl/*/*.c'), glob('providers/*.c'),
+ glob('providers/*/*.c'), glob('providers/*/*/*.c') );
} else {
+ die "-module isn't useful without -internal\n" if scalar keys %modules > 0;
@source = @ARGV;
}
# Data parsed out of the config and state files.
+# We always map function-code values to zero, so items marked below with
+# an asterisk could eventually be removed. TODO(4.0)
my %hinc; # lib -> header
my %libinc; # header -> lib
my %cskip; # error_file -> lib
my %errorfile; # lib -> error file name
-my %fmax; # lib -> max assigned function code
+my %fmax; # lib -> max assigned function code*
my %rmax; # lib -> max assigned reason code
-my %fassigned; # lib -> colon-separated list of assigned function codes
+my %fassigned; # lib -> colon-separated list of assigned function codes*
my %rassigned; # lib -> colon-separated list of assigned reason codes
-my %fnew; # lib -> count of new function codes
+my %fnew; # lib -> count of new function codes*
my %rnew; # lib -> count of new reason codes
my %rextra; # "extra" reason code -> lib
my %rcodes; # reason-name -> value
-my %ftrans; # old name -> #define-friendly name (all caps)
-my %fcodes; # function-name -> value
+my %ftrans; # old name -> #define-friendly name (all caps)*
+my %fcodes; # function-name -> value*
my $statefile; # state file with assigned reason and function codes
my %strings; # define -> text
}
close IN;
-my $statefile_prolog = '';
if ( ! $statefile ) {
$statefile = $config;
$statefile =~ s/.ec/.txt/;
# Scan function and reason codes and store them: keep a note of the
# maximum code used.
- my $collecting = 1;
while ( <STATE> ) {
- $statefile_prolog .= $_ if $collecting && ( /^#/ || /^$/ );
next if /^#/ || /^$/;
my $name;
my $code;
} else {
die "Bad line in $statefile:\n$_\n";
}
- $collecting = 0;
my $lib = $name;
- $lib =~ s/_.*//;
+ $lib =~ s/^((?:OSSL_|OPENSSL_)?[^_]{2,}).*$/$1/;
$lib = "SSL" if $lib =~ /TLS/;
if ( !defined $errorfile{$lib} ) {
print "Skipping $_";
$skippedstate++;
next;
}
- if ( $name =~ /^[A-Z0-9]+_R_/ ) {
+ if ( $name =~ /^(?:OSSL_|OPENSSL_)?[A-Z0-9]{2,}_R_/ ) {
die "$lib reason code $code collision at $name\n"
if $rassigned{$lib} =~ /:$code:/;
$rassigned{$lib} .= "$code:";
$rmax{$lib} = $code if $code > $rmax{$lib};
}
$rcodes{$name} = $code;
- } elsif ( $name =~ /^[A-Z0-9]+_F_/ ) {
+ } elsif ( $name =~ /^(?:OSSL_|OPENSSL_)?[A-Z0-9]{2,}_F_/ ) {
die "$lib function code $code collision at $name\n"
if $fassigned{$lib} =~ /:$code:/;
$fassigned{$lib} .= "$code:";
$func = $1;
}
- if ( /(([A-Z0-9]+)_F_([A-Z0-9_]+))/ ) {
+ if ( /(((?:OSSL_|OPENSSL_)?[A-Z0-9]{2,})_F_([A-Z0-9_]+))/ ) {
next unless exists $errorfile{$2};
next if $1 eq "BIO_F_BUFFER_CTX";
$usedfuncs{$1} = 1;
$fnew{$2}++;
}
$ftrans{$3} = $func unless exists $ftrans{$3};
- if ( uc($func) ne $3 ) {
- print STDERR "ERROR: mismatch $file:$linenr $func:$3\n";
- $errors++;
- }
print STDERR " Function $1 = $fcodes{$1}\n"
if $debug;
}
- if ( /(([A-Z0-9]+)_R_[A-Z0-9_]+)/ ) {
+ if ( /(((?:OSSL_|OPENSSL_)?[A-Z0-9]{2,})_R_[A-Z0-9_]+)/ ) {
next unless exists $errorfile{$2};
$usedreasons{$1} = 1;
if ( !exists $rcodes{$1} ) {
&phase("Writing files");
my $newstate = 0;
foreach my $lib ( keys %errorfile ) {
- if ( ! $fnew{$lib} && ! $rnew{$lib} ) {
- next unless $rebuild;
- }
+ next if ! $fnew{$lib} && ! $rnew{$lib} && ! $rebuild;
+ next if scalar keys %modules > 0 && !$modules{$lib};
next if $nowrite;
print STDERR "$lib: $fnew{$lib} new functions\n" if $fnew{$lib};
print STDERR "$lib: $rnew{$lib} new reasons\n" if $rnew{$lib};
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};
* 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
+ * Licensed under the Apache License 2.0 (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
#ifndef HEADER_${lib}ERR_H
# define HEADER_${lib}ERR_H
+# include <openssl/opensslconf.h>
+# include <openssl/symhacks.h>
+
+
EOF
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, @disablables_int)) {
+ print OUT <<"EOF";
+# include <openssl/opensslconf.h>
+
+# ifndef OPENSSL_NO_${lib}
+
+EOF
+ $indent = " ";
+ }
print OUT <<"EOF";
-# ifdef __cplusplus
-extern \"C\" {
-# endif
+#${indent}ifdef __cplusplus
+extern \"C\"
+#${indent}endif
int ERR_load_${lib}_strings(void);
-# ifdef __cplusplus
-}
-# endif
EOF
} else {
print OUT <<"EOF";
-# define ${lib}err(f, r) ERR_${lib}_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)
+# define ${lib}err(f, r) ERR_${lib}_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
EOF
if ( ! $static ) {
}
print OUT "\n/*\n * $lib function codes.\n */\n";
+ print OUT "# if !OPENSSL_API_3\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;
$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 0\n", " " x $z;
}
+ print OUT "# endif\n";
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;
$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 "#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.
* 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
+ * Licensed under the Apache License 2.0 (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
#ifndef OPENSSL_NO_ERR
-static ${const}ERR_STRING_DATA ${lib}_str_functs[] = {
-EOF
-
- # Add each function code: if a function name is found then use it.
- foreach my $i ( @function ) {
- my $fn;
- if ( exists $strings{$i} and $strings{$i} ne '' ) {
- $fn = $strings{$i};
- $fn = "" if $fn eq '*';
- } else {
- $i =~ /^${lib}_F_(\S+)$/;
- $fn = $1;
- $fn = $ftrans{$fn} if exists $ftrans{$fn};
- $strings{$i} = $fn;
- }
- my $short = " {ERR_PACK($pack_lib, $i, 0), \"$fn\"},";
- if ( length($short) <= 80 ) {
- print OUT "$short\n";
- } else {
- print OUT " {ERR_PACK($pack_lib, $i, 0),\n \"$fn\"},\n";
- }
- }
- print OUT <<"EOF";
- {0, NULL}
-};
-
static ${const}ERR_STRING_DATA ${lib}_str_reasons[] = {
EOF
int ERR_load_${lib}_strings(void)
{
#ifndef OPENSSL_NO_ERR
- if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL) {
- ERR_load_strings_const(${lib}_str_functs);
+ if (ERR_func_error_string(${lib}_str_reasons[0].error) == NULL)
ERR_load_strings_const(${lib}_str_reasons);
- }
#endif
return 1;
}
if (!error_loaded) {
#ifndef OPENSSL_NO_ERR
- ERR_load_strings(lib_code, ${lib}_str_functs);
ERR_load_strings(lib_code, ${lib}_str_reasons);
#endif
error_loaded = 1;
{
if (error_loaded) {
#ifndef OPENSSL_NO_ERR
- ERR_unload_strings(lib_code, ${lib}_str_functs);
ERR_unload_strings(lib_code, ${lib}_str_reasons);
#endif
error_loaded = 0;
{
if (lib_code == 0)
lib_code = ERR_get_next_error_library();
- ERR_PUT_error(lib_code, function, reason, file, line);
+ ERR_raise(lib_code, reason);
+ ERR_set_debug(file, line, NULL);
}
EOF
if ( $newstate ) {
open(OUT, ">$statefile.new")
|| die "Can't write $statefile.new, $!";
- print OUT $statefile_prolog;
- print OUT "# Function codes\n";
+ print OUT <<"EOF";
+# Copyright 1999-$YEAR The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the Apache License 2.0 (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
+EOF
+ print OUT "\n# Function codes\n";
foreach my $i ( sort keys %fcodes ) {
my $short = "$i:$fcodes{$i}:";
my $t = exists $strings{$i} ? $strings{$i} : "";
projects / openssl.git / blobdiff