root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Dr. Matthias St. Pierre 2020-04-13 23:09:45 +02:00
parent ff1f7cdeb1
commit 9bf475fcf3
29 changed files with 1 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/openssl/asn1err.h
View File

@ -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>

5
include/openssl/asyncerr.h
View File

@ -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>

5
include/openssl/bioerr.h
View File

@ -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>

5
include/openssl/bnerr.h
View File

@ -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>

5
include/openssl/buffererr.h
View File

@ -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>

5
include/openssl/cmserr.h
View File

@ -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>

5
include/openssl/comperr.h
View File

@ -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>

5
include/openssl/conferr.h
View File

@ -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>

5
include/openssl/cryptoerr.h
View File

@ -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>

5
include/openssl/cterr.h
View File

@ -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>

5
include/openssl/dherr.h
View File

@ -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>

5
include/openssl/dsaerr.h
View File

@ -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>

5
include/openssl/ecerr.h
View File

@ -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>

5
include/openssl/engineerr.h
View File

@ -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>

5
include/openssl/kdferr.h
View File

@ -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>

5
include/openssl/objectserr.h
View File

@ -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>

5
include/openssl/ocsperr.h
View File

@ -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>

5
include/openssl/pemerr.h
View File

@ -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>

5
include/openssl/pkcs12err.h
View File

@ -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>

5
include/openssl/pkcs7err.h
View File

@ -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>

5
include/openssl/randerr.h
View File

@ -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>

5
include/openssl/rsaerr.h
View File

@ -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>

5
include/openssl/sslerr.h
View File

@ -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>

5
include/openssl/storeerr.h
View File

@ -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>

5
include/openssl/tserr.h
View File

@ -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>

5
include/openssl/uierr.h
View File

@ -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>

5
include/openssl/x509err.h
View File

@ -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>

5
include/openssl/x509v3err.h
View File

@ -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>

1
util/mkerr.pl
View File

@ -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>