[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  28a5f5b39c54751c825c05677e23406eda37d16b (commit)
      from  7889e7aef821c0c9917188d59f53253645c07928 (commit)


- Log -----------------------------------------------------------------
commit 28a5f5b39c54751c825c05677e23406eda37d16b
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 18 11:00:31 2020 +0200

    util/mkerr.h: Restore header file rename
    
    With '-internal', we commonly write the reason code macros to header
    file renamed 'name.h' to 'nameerr.h'.  That renaming was removed by
    mistake, this restores it.
    
    Fixes #12891
    
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/12910)

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

Summary of changes:
 util/mkerr.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 16ca06ef83..0c7ae7b56d 100755
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -437,6 +437,7 @@ foreach my $lib ( keys %errorfile ) {
     # Rewrite the header file
 
     my $hfile = $hinc{$lib};
+    $hfile =~ s/.h$/err.h/ if $internal;
     open( OUT, ">$hfile" ) || die "Can't write to $hfile, $!,";
     print OUT <<"EOF";
 /*