[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  dc5d74e648c499d5247ff2d3db125c347abc5c1f (commit)
      from  278de77b881739267d86f96088557af3da966982 (commit)


- Log -----------------------------------------------------------------
commit dc5d74e648c499d5247ff2d3db125c347abc5c1f
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Dec 1 09:14:48 2019 +0100

    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 at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10549)

-----------------------------------------------------------------------

Summary of changes:
 util/mkerr.pl | 6 ------
 1 file changed, 6 deletions(-)

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