mkerr: remove legacy guards from generated error headers

In pull request #9333, legacy guards were added to the generated
error headers, but the mkerr.pl script was not adjusted accordingly.
So the legacy guards were removed by subsequent `make update` calls.

Fixing the mkerr.pl script properly was disproportionately complicated
by the fact that adding legacy guards only made sense for files which
already existed in version 1.1.1. To keep things simple, it was decided
to drop the legacy guards from the generated headers entirely.

Fixes #10569

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11541)

29 files changed, 1 insertions, 140 deletions

diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index 15f9939..a9bfc01 100644
--- a/include/openssl/asn1err.h
+++ b/include/openssl/asn1err.h
@@ -12,11 +12,6 @@
 # define OPENSSL_ASN1ERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ASN1ERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/asyncerr.h b/include/openssl/asyncerr.h
index 17defd0..66cfc32 100644
--- a/include/openssl/asyncerr.h
+++ b/include/openssl/asyncerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_ASYNCERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ASYNCERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h
index 95cc056..fe7d36e 100644
--- a/include/openssl/bioerr.h
+++ b/include/openssl/bioerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_BIOERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_BIOERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h
index cce4cbb..8e03cf8 100644
--- a/include/openssl/bnerr.h
+++ b/include/openssl/bnerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_BNERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_BNERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h
index 1a5de3a..e7674fd 100644
--- a/include/openssl/buffererr.h
+++ b/include/openssl/buffererr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_BUFFERERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_BUFERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h
index d4d8134..6cff785 100644
--- a/include/openssl/cmserr.h
+++ b/include/openssl/cmserr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_CMSERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CMSERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h
index 4794562..03176b4 100644
--- a/include/openssl/comperr.h
+++ b/include/openssl/comperr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_COMPERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_COMPERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h
index b3d2596..f66f2e8 100644
--- a/include/openssl/conferr.h
+++ b/include/openssl/conferr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_CONFERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CONFERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index ae146c4..631a930 100644
--- a/include/openssl/cryptoerr.h
+++ b/include/openssl/cryptoerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_CRYPTOERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CRYPTOERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h
index b0d904e..0d50c0b 100644
--- a/include/openssl/cterr.h
+++ b/include/openssl/cterr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_CTERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CTERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h
index 463019d..4410ff3 100644
--- a/include/openssl/dherr.h
+++ b/include/openssl/dherr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_DHERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_DHERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h
index 48dd7d0..0d70b96 100644
--- a/include/openssl/dsaerr.h
+++ b/include/openssl/dsaerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_DSAERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_DSAERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h
index 88399db..41d592b 100644
--- a/include/openssl/ecerr.h
+++ b/include/openssl/ecerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_ECERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ECERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h
index 006d73a..b103a0c 100644
--- a/include/openssl/engineerr.h
+++ b/include/openssl/engineerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_ENGINEERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ENGINEERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/kdferr.h b/include/openssl/kdferr.h
index 31f112c..3d6a7ff 100644
--- a/include/openssl/kdferr.h
+++ b/include/openssl/kdferr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_KDFERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_OSSL_KDFERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h
index 84c7501..0e489e4 100644
--- a/include/openssl/objectserr.h
+++ b/include/openssl/objectserr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_OBJECTSERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_OBJERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h
index 7e3fd0f..2f72891 100644
--- a/include/openssl/ocsperr.h
+++ b/include/openssl/ocsperr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_OCSPERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_OCSPERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h
index c37a3ac..828a624 100644
--- a/include/openssl/pemerr.h
+++ b/include/openssl/pemerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_PEMERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_PEMERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h
index 12eac4a..78334ff 100644
--- a/include/openssl/pkcs12err.h
+++ b/include/openssl/pkcs12err.h
@@ -12,11 +12,6 @@
 # define OPENSSL_PKCS12ERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_PKCS12ERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h
index 41735bd..fd1f3da 100644
--- a/include/openssl/pkcs7err.h
+++ b/include/openssl/pkcs7err.h
@@ -12,11 +12,6 @@
 # define OPENSSL_PKCS7ERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_PKCS7ERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h
index 780d268..a0b82b4 100644
--- a/include/openssl/randerr.h
+++ b/include/openssl/randerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_RANDERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RANDERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h
index ef72bc7..34df111 100644
--- a/include/openssl/rsaerr.h
+++ b/include/openssl/rsaerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_RSAERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RSAERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index e1617aa..47667f9 100644
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_SSLERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SSLERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h
index cb7304d..ddcce6b 100644
--- a/include/openssl/storeerr.h
+++ b/include/openssl/storeerr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_STOREERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_OSSL_STOREERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h
index 4684dc2..4f7415c 100644
--- a/include/openssl/tserr.h
+++ b/include/openssl/tserr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_TSERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_TSERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h
index dbc6432..fb0e311 100644
--- a/include/openssl/uierr.h
+++ b/include/openssl/uierr.h
@@ -12,11 +12,6 @@
 # define OPENSSL_UIERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_UIERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h
index 2653870..b3a5fb3 100644
--- a/include/openssl/x509err.h
+++ b/include/openssl/x509err.h
@@ -12,11 +12,6 @@
 # define OPENSSL_X509ERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_X509ERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h
index 4a30585..eb3593f 100644
--- a/include/openssl/x509v3err.h
+++ b/include/openssl/x509v3err.h
@@ -12,11 +12,6 @@
 # define OPENSSL_X509V3ERR_H
 # pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_X509V3ERR_H
-# endif
-
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
 
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 3f59e04..48c5b37 100755
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -450,6 +450,7 @@ foreach my $lib ( keys %errorfile ) {
 
 #ifndef OPENSSL_${lib}ERR_H
 # define OPENSSL_${lib}ERR_H
+# pragma once
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>