[openssl] OpenSSL_1_1_1-stable update

[matthias.st.pierre at ncp-e.com]

The branch OpenSSL_1_1_1-stable has been updated
       via  2f11f2e810c7f48a001986f3eb47b3b9166e2836 (commit)
      from  fa2f67f707401f9a94f11de8603cfde5c092e43b (commit)


- Log -----------------------------------------------------------------
commit 2f11f2e810c7f48a001986f3eb47b3b9166e2836
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Fri Dec 13 12:25:15 2019 +0100

    util/mkerr.pl: revert accidental change of header guards
    
    This change was backported accidentally from master in commit fbbfd128c9aa.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10623)

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

Summary of changes:
 util/mkerr.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/mkerr.pl b/util/mkerr.pl
index dc652e0a0d..df085fb3db 100755
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -450,8 +450,8 @@ foreach my $lib ( keys %errorfile ) {
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OPENSSL_${lib}ERR_H
-# define OPENSSL_${lib}ERR_H
+#ifndef HEADER_${lib}ERR_H
+# define HEADER_${lib}ERR_H
 
 # include <openssl/symhacks.h>