From: Richard Levitte <levitte@openssl.org>
Date: Sun, 1 Dec 2019 08:14:48 +0000 (+0100)
Subject: util/mkerr.pl: don't stop reading conserved symbols from the state file
X-Git-Tag: openssl-3.0.0-alpha1~866
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc5d74e648c499d5247ff2d3db125c347abc5c1f;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 0b09fb3327e..d72b4079090 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"