wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Have mkerr.pl treat already existing multiline string defs properly

Browse source 
Since source reformat, we ended up with some error reason string
definitions that spanned two lines.  That in itself is fine, but we
sometimes edited them to provide better strings than what could be
automatically determined from the reason macro, for example:

    {ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
     "Peer haven't sent GOST certificate, required for selected ciphersuite"},

However, mkerr.pl didn't treat those two-line definitions right, and
they ended up being retranslated to whatever the macro name would
indicate, for example:

    {ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
     "No gost certificate sent by peer"},

Clearly not what we wanted.  This change fixes this problem.

Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 2cfdfe0918)
This commit is contained in:
Richard Levitte 2015-04-08 19:26:11 +02:00
parent 591c819c30
commit 079495cad2
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
util/mkerr.pl
View file

@ -534,14 +534,21 @@ EOF
# First, read any existing reason string definitions: # First, read any existing reason string definitions:
my %err_reason_strings; my %err_reason_strings;
if (open(IN,"<$cfile")) { if (open(IN,"<$cfile")) {
my $line = "";
while (<IN>) { while (<IN>) {
if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { chomp;
$err_reason_strings{$1} = $2; $_ = $line . $_;
} $line = "";
if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) { if (/{ERR_(FUNC|REASON)\(/) {
if (!exists $ftrans{$1} && ($1 ne $2)) { if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) {
print STDERR "WARNING: Mismatched function string $2\n"; $err_reason_strings{$1} = $2;
$ftrans{$1} = $2; } elsif (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) {
if (!exists $ftrans{$1} && ($1 ne $2)) {
print STDERR "WARNING: Mismatched function string $2\n";
$ftrans{$1} = $2;
}
} else {
$line = $_;
} }
} }
} }