From 9bf475fcf366c386d8757c6c6fd9f9313a0b310a Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Mon, 13 Apr 2020 23:09:45 +0200 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/11541) --- include/openssl/asn1err.h | 5 ----- include/openssl/asyncerr.h | 5 ----- include/openssl/bioerr.h | 5 ----- include/openssl/bnerr.h | 5 ----- include/openssl/buffererr.h | 5 ----- include/openssl/cmserr.h | 5 ----- include/openssl/comperr.h | 5 ----- include/openssl/conferr.h | 5 ----- include/openssl/cryptoerr.h | 5 ----- include/openssl/cterr.h | 5 ----- include/openssl/dherr.h | 5 ----- include/openssl/dsaerr.h | 5 ----- include/openssl/ecerr.h | 5 ----- include/openssl/engineerr.h | 5 ----- include/openssl/kdferr.h | 5 ----- include/openssl/objectserr.h | 5 ----- include/openssl/ocsperr.h | 5 ----- include/openssl/pemerr.h | 5 ----- include/openssl/pkcs12err.h | 5 ----- include/openssl/pkcs7err.h | 5 ----- include/openssl/randerr.h | 5 ----- include/openssl/rsaerr.h | 5 ----- include/openssl/sslerr.h | 5 ----- include/openssl/storeerr.h | 5 ----- include/openssl/tserr.h | 5 ----- include/openssl/uierr.h | 5 ----- include/openssl/x509err.h | 5 ----- include/openssl/x509v3err.h | 5 ----- util/mkerr.pl | 1 + 29 files changed, 1 insertion(+), 140 deletions(-) diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h index 15f993915a4..a9bfc016fb5 100644 --- a/include/openssl/asn1err.h +++ b/include/openssl/asn1err.h @@ -12,11 +12,6 @@ # define OPENSSL_ASN1ERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_ASN1ERR_H -# endif - # include # include diff --git a/include/openssl/asyncerr.h b/include/openssl/asyncerr.h index 17defd0494d..66cfc32d948 100644 --- a/include/openssl/asyncerr.h +++ b/include/openssl/asyncerr.h @@ -12,11 +12,6 @@ # define OPENSSL_ASYNCERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_ASYNCERR_H -# endif - # include # include diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h index 95cc05651f3..fe7d36ebd39 100644 --- a/include/openssl/bioerr.h +++ b/include/openssl/bioerr.h @@ -12,11 +12,6 @@ # define OPENSSL_BIOERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_BIOERR_H -# endif - # include # include diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h index cce4cbbf970..8e03cf85e14 100644 --- a/include/openssl/bnerr.h +++ b/include/openssl/bnerr.h @@ -12,11 +12,6 @@ # define OPENSSL_BNERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_BNERR_H -# endif - # include # include diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h index 1a5de3a65de..e7674fd8fcb 100644 --- a/include/openssl/buffererr.h +++ b/include/openssl/buffererr.h @@ -12,11 +12,6 @@ # define OPENSSL_BUFFERERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_BUFERR_H -# endif - # include # include diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h index d4d8134171a..6cff785caac 100644 --- a/include/openssl/cmserr.h +++ b/include/openssl/cmserr.h @@ -12,11 +12,6 @@ # define OPENSSL_CMSERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_CMSERR_H -# endif - # include # include diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h index 47945628ee2..03176b4f986 100644 --- a/include/openssl/comperr.h +++ b/include/openssl/comperr.h @@ -12,11 +12,6 @@ # define OPENSSL_COMPERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_COMPERR_H -# endif - # include # include diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h index b3d2596f688..f66f2e8a81b 100644 --- a/include/openssl/conferr.h +++ b/include/openssl/conferr.h @@ -12,11 +12,6 @@ # define OPENSSL_CONFERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_CONFERR_H -# endif - # include # include diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h index ae146c4079c..631a930dae9 100644 --- a/include/openssl/cryptoerr.h +++ b/include/openssl/cryptoerr.h @@ -12,11 +12,6 @@ # define OPENSSL_CRYPTOERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_CRYPTOERR_H -# endif - # include # include diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h index b0d904eb1f1..0d50c0bfdde 100644 --- a/include/openssl/cterr.h +++ b/include/openssl/cterr.h @@ -12,11 +12,6 @@ # define OPENSSL_CTERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_CTERR_H -# endif - # include # include diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h index 463019d0e1b..4410ff33468 100644 --- a/include/openssl/dherr.h +++ b/include/openssl/dherr.h @@ -12,11 +12,6 @@ # define OPENSSL_DHERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_DHERR_H -# endif - # include # include diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h index 48dd7d03b75..0d70b96a020 100644 --- a/include/openssl/dsaerr.h +++ b/include/openssl/dsaerr.h @@ -12,11 +12,6 @@ # define OPENSSL_DSAERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_DSAERR_H -# endif - # include # include diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h index 88399db50d2..41d592b0854 100644 --- a/include/openssl/ecerr.h +++ b/include/openssl/ecerr.h @@ -12,11 +12,6 @@ # define OPENSSL_ECERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_ECERR_H -# endif - # include # include diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h index 006d73a4312..b103a0cf6a5 100644 --- a/include/openssl/engineerr.h +++ b/include/openssl/engineerr.h @@ -12,11 +12,6 @@ # define OPENSSL_ENGINEERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_ENGINEERR_H -# endif - # include # include diff --git a/include/openssl/kdferr.h b/include/openssl/kdferr.h index 31f112c741b..3d6a7ffd537 100644 --- a/include/openssl/kdferr.h +++ b/include/openssl/kdferr.h @@ -12,11 +12,6 @@ # define OPENSSL_KDFERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_OSSL_KDFERR_H -# endif - # include # include diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h index 84c75012d29..0e489e47529 100644 --- a/include/openssl/objectserr.h +++ b/include/openssl/objectserr.h @@ -12,11 +12,6 @@ # define OPENSSL_OBJECTSERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_OBJERR_H -# endif - # include # include diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h index 7e3fd0f703f..2f72891d002 100644 --- a/include/openssl/ocsperr.h +++ b/include/openssl/ocsperr.h @@ -12,11 +12,6 @@ # define OPENSSL_OCSPERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_OCSPERR_H -# endif - # include # include diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h index c37a3acb9e6..828a624b66c 100644 --- a/include/openssl/pemerr.h +++ b/include/openssl/pemerr.h @@ -12,11 +12,6 @@ # define OPENSSL_PEMERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_PEMERR_H -# endif - # include # include diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h index 12eac4a75ca..78334fffaf7 100644 --- a/include/openssl/pkcs12err.h +++ b/include/openssl/pkcs12err.h @@ -12,11 +12,6 @@ # define OPENSSL_PKCS12ERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_PKCS12ERR_H -# endif - # include # include diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h index 41735bdfc8c..fd1f3da7e57 100644 --- a/include/openssl/pkcs7err.h +++ b/include/openssl/pkcs7err.h @@ -12,11 +12,6 @@ # define OPENSSL_PKCS7ERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_PKCS7ERR_H -# endif - # include # include diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h index 780d2680a52..a0b82b45f71 100644 --- a/include/openssl/randerr.h +++ b/include/openssl/randerr.h @@ -12,11 +12,6 @@ # define OPENSSL_RANDERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_RANDERR_H -# endif - # include # include diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h index ef72bc744ef..34df111eafb 100644 --- a/include/openssl/rsaerr.h +++ b/include/openssl/rsaerr.h @@ -12,11 +12,6 @@ # define OPENSSL_RSAERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_RSAERR_H -# endif - # include # include diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index e1617aae45d..47667f9a0ae 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -12,11 +12,6 @@ # define OPENSSL_SSLERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_SSLERR_H -# endif - # include # include diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h index cb7304d9e50..ddcce6bfede 100644 --- a/include/openssl/storeerr.h +++ b/include/openssl/storeerr.h @@ -12,11 +12,6 @@ # define OPENSSL_STOREERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_OSSL_STOREERR_H -# endif - # include # include diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h index 4684dc2652a..4f7415cc383 100644 --- a/include/openssl/tserr.h +++ b/include/openssl/tserr.h @@ -12,11 +12,6 @@ # define OPENSSL_TSERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_TSERR_H -# endif - # include # include diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h index dbc6432476c..fb0e3114a15 100644 --- a/include/openssl/uierr.h +++ b/include/openssl/uierr.h @@ -12,11 +12,6 @@ # define OPENSSL_UIERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_UIERR_H -# endif - # include # include diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h index 2653870d29a..b3a5fb355f5 100644 --- a/include/openssl/x509err.h +++ b/include/openssl/x509err.h @@ -12,11 +12,6 @@ # define OPENSSL_X509ERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_X509ERR_H -# endif - # include # include diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h index 4a305853dfa..eb3593fa209 100644 --- a/include/openssl/x509v3err.h +++ b/include/openssl/x509v3err.h @@ -12,11 +12,6 @@ # define OPENSSL_X509V3ERR_H # pragma once -# include -# ifndef OPENSSL_NO_DEPRECATED_3_0 -# define HEADER_X509V3ERR_H -# endif - # include # include diff --git a/util/mkerr.pl b/util/mkerr.pl index 3f59e04e1a7..48c5b37e913 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 # include -- 2.47.2