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)

diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index 15f993915a432416fe0b3c70a9ba3912162930dc..a9bfc016fb55eaf8c7b7f7a797676f31d4e497ef 100644 (file)
--- 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 17defd0494d2bdd3ddd5c765e5967beb8b9af92e..66cfc32d948439a86f6af3d0f90e9e69ab05b575 100644 (file)
--- 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 95cc05651f31bd804be4595f6eb3ad225e8cfaf0..fe7d36ebd397869216f579099c91e90f9d39497a 100644 (file)
--- 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 cce4cbbf970402abb4e11acef32832a47653a3d4..8e03cf85e14db89e505a56bef9b0620bb08579ad 100644 (file)
--- 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 1a5de3a65deaf959ead15805152a5b061b928a47..e7674fd8fcb40e4a3d6e39cea9058b392c2f1f2b 100644 (file)
--- 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 d4d8134171aff834c73afb4a49ec9f447b4a2a50..6cff785caace3e16399efcf3b2ba31301016b567 100644 (file)
--- 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 47945628ee2f23b90decfe0e32bafc426650720b..03176b4f98664e662f6d60af7b47f23b5549f3b6 100644 (file)
--- 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 b3d2596f68813bc567af931d15bd896051f905b8..f66f2e8a81bb30e11616ead3340a9710b5001f8e 100644 (file)
--- 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 ae146c4079cac4c1fbf57e5366d70f805ecdb151..631a930dae97d4115424ce383e738d5e0253129d 100644 (file)
--- 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 b0d904eb1f10a413582d87629ce486eb9e3fa877..0d50c0bfddefdcc5d6b29fa90bb21ec569386db6 100644 (file)
--- 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 463019d0e1b7e61858b12a11a89dedf138c88348..4410ff3346832facd69495347bf498171b2282bf 100644 (file)
--- 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 48dd7d03b75a6f8b3b3107ed577cc0a3adeb48f9..0d70b96a020949df7366fcea707f81bd9469834b 100644 (file)
--- 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 88399db50d28d4b7e88077559cd8c41314d6277e..41d592b0854b71ad7cc4f7d85d467ad36a42fff7 100644 (file)
--- 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 006d73a43126ad85c6b7fdf7b6e41c0b31a15b4d..b103a0cf6a543139ba41639e451b08906950e499 100644 (file)
--- 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 31f112c741b21cd9eee01d9ced9e2baec11ba043..3d6a7ffd53782f0f5ed25513a4f0a1836eeeff61 100644 (file)
--- 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 84c75012d29be9143337eca1bd6fe995d442c674..0e489e475294e0dc30ad7379d97a46e899640425 100644 (file)
--- 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 7e3fd0f703fe3aa8378847b312cba54eeb0b5923..2f72891d002705dd5e9ae82dec64b16f30223c95 100644 (file)
--- 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 c37a3acb9e6e05d9fc7faada2146094e153c258f..828a624b66c2ec25c1be3ca3008dd4d4ac477c7f 100644 (file)
--- 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 12eac4a75caa4533191723191099ad5778a9a98d..78334fffaf7130774aec544472e8b9660153d722 100644 (file)
--- 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 41735bdfc8c95d7b99cc1e7ae1d261dc795dfd33..fd1f3da7e57c667d6ebd27bbdb696d68d8d892ac 100644 (file)
--- 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 780d2680a528c5da57ebf6b092254ce7ca91e1c3..a0b82b45f715b2c98a8754d2b67731371ede02e9 100644 (file)
--- 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 ef72bc744ef1434da4c2ad7dc3035efb193458f2..34df111eafb304319eb96e0cb1e7e565f9d9f0f5 100644 (file)
--- 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 e1617aae45dee9f5f018ead1127cbf0cfe23619e..47667f9a0ae7c9e60fbdeec349d8629d0eea3b04 100644 (file)
--- 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 cb7304d9e500bf621ed7c5146fdd92db2cdc1d39..ddcce6bfede0dedcf7d34e423ed040efad6ac4e1 100644 (file)
--- 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 4684dc2652a7e8c15fb1d359cf9c920c683170eb..4f7415cc383c7698dc1b66c4f27e32f38c5a5b91 100644 (file)
--- 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 dbc6432476c2380289d888ee327bd99bb705eef1..fb0e3114a15a281ed9c1ca8afa4d74b5c6383028 100644 (file)
--- 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 2653870d29ae7597b472c7929b88846d1165f793..b3a5fb355f590db02b73a0a0f263d52a290dacea 100644 (file)
--- 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 4a305853dfaa1b62ec41628655154dccc30421c1..eb3593fa20995cc5daf1445133a7150f27c4873a 100644 (file)
--- 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 3f59e04e1a7d6cbb0c49de16b8b9aaab21376a64..48c5b37e91350c1742e7079e45974d91d4fc9fae 100755 (executable)
--- 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>