diff options
author | Richard Levitte <levitte@openssl.org> | 2019-12-01 09:14:48 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-12-04 00:22:24 +0100 |
commit | dc5d74e648c499d5247ff2d3db125c347abc5c1f (patch) | |
tree | 9afa434dd0330b61fba74b56f720de88bc8f4781 /util | |
parent | 278de77b881739267d86f96088557af3da966982 (diff) | |
download | openssl-dc5d74e648c499d5247ff2d3db125c347abc5c1f.zip openssl-dc5d74e648c499d5247ff2d3db125c347abc5c1f.tar.gz openssl-dc5d74e648c499d5247ff2d3db125c347abc5c1f.tar.bz2 |
util/mkerr.pl: don't stop reading conserved symbols from the state file
If we don't read them, they will not be conserved.
Fixes #10522
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10549)
Diffstat (limited to 'util')
-rwxr-xr-x | util/mkerr.pl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/util/mkerr.pl b/util/mkerr.pl index 0b09fb3..d72b407 100755 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -210,12 +210,6 @@ if ( ! $reindex && $statefile ) { print "Skipping $_"; $skippedstate++; next; - } elsif ( $hinc{$lib} eq 'NONE' ) { - # When the header is NONE but the err file is specified, - # it signifies that the err file should be conserved but - # remain untouched, and the same goes for the symbols in - # the state file. - next; } if ( $name =~ /^(?:OSSL_|OPENSSL_)?[A-Z0-9]{2,}_R_/ ) { die "$lib reason code $code collision at $name\n" |