diff options
author | Rich Salz <rsalz@akamai.com> | 2019-07-30 15:40:23 -0400 |
---|---|---|
committer | Rich Salz <rsalz@akamai.com> | 2019-09-19 09:27:38 -0400 |
commit | f6aca23e268799380e4e4193789ed96db1ed57f3 (patch) | |
tree | 078b9b53ce4c48eb20f9a083aaf3032104d6f192 /include | |
parent | 0f17ac26fc552b7f233e8765e6b6a278c9731e2a (diff) |
Deprecate XXXerr() macros
Actually, for transition, they're not really deprecated. Remove the
"1 ||" from the ifdef line (in include/openssl/err.h) when ready to
do this in production/"for real"
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9441)
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/err.h | 83 |
1 files changed, 42 insertions, 41 deletions
diff --git a/include/openssl/err.h b/include/openssl/err.h index d7427898c8..5c647831b5 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -108,48 +108,49 @@ struct err_state_st { # define ERR_LIB_USER 128 -# if ! OPENSSL_API_3 -# define SYSerr(f,r) ERR_raise(ERR_LIB_SYS,(r)) +# if 1 || !OPENSSL_API_3 +# define ASN1err(f, r) ERR_raise_data(ERR_LIB_ASN1, (r), NULL) +# define ASYNCerr(f, r) ERR_raise_data(ERR_LIB_ASYNC, (r), NULL) +# define BIOerr(f, r) ERR_raise_data(ERR_LIB_BIO, (r), NULL) +# define BNerr(f, r) ERR_raise_data(ERR_LIB_BN, (r), NULL) +# define BUFerr(f, r) ERR_raise_data(ERR_LIB_BUF, (r), NULL) +# define CMPerr(f, r) ERR_raise_data(ERR_LIB_CMP, (r), NULL) +# define CMSerr(f, r) ERR_raise_data(ERR_LIB_CMS, (r), NULL) +# define COMPerr(f, r) ERR_raise_data(ERR_LIB_COMP, (r), NULL) +# define CONFerr(f, r) ERR_raise_data(ERR_LIB_CONF, (r), NULL) +# define CRMFerr(f, r) ERR_raise_data(ERR_LIB_CRMF, (r), NULL) +# define CRYPTOerr(f, r) ERR_raise_data(ERR_LIB_CRYPTO, (r), NULL) +# define CTerr(f, r) ERR_raise_data(ERR_LIB_CT, (r), NULL) +# define DHerr(f, r) ERR_raise_data(ERR_LIB_DH, (r), NULL) +# define DSAerr(f, r) ERR_raise_data(ERR_LIB_DSA, (r), NULL) +# define DSOerr(f, r) ERR_raise_data(ERR_LIB_DSO, (r), NULL) +# define ECDHerr(f, r) ERR_raise_data(ERR_LIB_ECDH, (r), NULL) +# define ECDSAerr(f, r) ERR_raise_data(ERR_LIB_ECDSA, (r), NULL) +# define ECerr(f, r) ERR_raise_data(ERR_LIB_EC, (r), NULL) +# define ENGINEerr(f, r) ERR_raise_data(ERR_LIB_ENGINE, (r), NULL) +# define ESSerr(f, r) ERR_raise_data(ERR_LIB_ESS, (r), NULL) +# define EVPerr(f, r) ERR_raise_data(ERR_LIB_EVP, (r), NULL) +# define FIPSerr(f, r) ERR_raise_data(ERR_LIB_FIPS, (r), NULL) +# define HMACerr(f, r) ERR_raise_data(ERR_LIB_HMAC, (r), NULL) +# define KDFerr(f, r) ERR_raise_data(ERR_LIB_KDF, (r), NULL) +# define OBJerr(f, r) ERR_raise_data(ERR_LIB_OBJ, (r), NULL) +# define OCSPerr(f, r) ERR_raise_data(ERR_LIB_OCSP, (r), NULL) +# define OSSL_STOREerr(f, r) ERR_raise_data(ERR_LIB_OSSL_STORE, (r), NULL) +# define PEMerr(f, r) ERR_raise_data(ERR_LIB_PEM, (r), NULL) +# define PKCS12err(f, r) ERR_raise_data(ERR_LIB_PKCS12, (r), NULL) +# define PKCS7err(f, r) ERR_raise_data(ERR_LIB_PKCS7, (r), NULL) +# define PROPerr(f, r) ERR_raise_data(ERR_LIB_PROP, (r), NULL) +# define PROVerr(f, r) ERR_raise_data(ERR_LIB_PROV, (r), NULL) +# define RANDerr(f, r) ERR_raise_data(ERR_LIB_RAND, (r), NULL) +# define RSAerr(f, r) ERR_raise_data(ERR_LIB_RSA, (r), NULL) +# define SM2err(f, r) ERR_raise_data(ERR_LIB_SM2, (r), NULL) +# define SSLerr(f, r) ERR_raise_data(ERR_LIB_SSL, (r), NULL) +# define SYSerr(f, r) ERR_raise_data(ERR_LIB_SYS, (r), NULL) +# define TSerr(f, r) ERR_raise_data(ERR_LIB_TS, (r), NULL) +# define UIerr(f, r) ERR_raise_data(ERR_LIB_UI, (r), NULL) +# define X509V3err(f, r) ERR_raise_data(ERR_LIB_X509V3, (r), NULL) +# define X509err(f, r) ERR_raise_data(ERR_LIB_X509, (r), NULL) # endif -# define BNerr(f,r) ERR_raise(ERR_LIB_BN,(r)) -# define RSAerr(f,r) ERR_raise(ERR_LIB_RSA,(r)) -# define DHerr(f,r) ERR_raise(ERR_LIB_DH,(r)) -# define EVPerr(f,r) ERR_raise(ERR_LIB_EVP,(r)) -# define BUFerr(f,r) ERR_raise(ERR_LIB_BUF,(r)) -# define OBJerr(f,r) ERR_raise(ERR_LIB_OBJ,(r)) -# define PEMerr(f,r) ERR_raise(ERR_LIB_PEM,(r)) -# define DSAerr(f,r) ERR_raise(ERR_LIB_DSA,(r)) -# define X509err(f,r) ERR_raise(ERR_LIB_X509,(r)) -# define ASN1err(f,r) ERR_raise(ERR_LIB_ASN1,(r)) -# define CONFerr(f,r) ERR_raise(ERR_LIB_CONF,(r)) -# define CRYPTOerr(f,r) ERR_raise(ERR_LIB_CRYPTO,(r)) -# define ECerr(f,r) ERR_raise(ERR_LIB_EC,(r)) -# define SSLerr(f,r) ERR_raise(ERR_LIB_SSL,(r)) -# define BIOerr(f,r) ERR_raise(ERR_LIB_BIO,(r)) -# define PKCS7err(f,r) ERR_raise(ERR_LIB_PKCS7,(r)) -# define X509V3err(f,r) ERR_raise(ERR_LIB_X509V3,(r)) -# define PKCS12err(f,r) ERR_raise(ERR_LIB_PKCS12,(r)) -# define RANDerr(f,r) ERR_raise(ERR_LIB_RAND,(r)) -# define DSOerr(f,r) ERR_raise(ERR_LIB_DSO,(r)) -# define ENGINEerr(f,r) ERR_raise(ERR_LIB_ENGINE,(r)) -# define OCSPerr(f,r) ERR_raise(ERR_LIB_OCSP,(r)) -# define UIerr(f,r) ERR_raise(ERR_LIB_UI,(r)) -# define COMPerr(f,r) ERR_raise(ERR_LIB_COMP,(r)) -# define ECDSAerr(f,r) ERR_raise(ERR_LIB_ECDSA,(r)) -# define ECDHerr(f,r) ERR_raise(ERR_LIB_ECDH,(r)) -# define OSSL_STOREerr(f,r) ERR_raise(ERR_LIB_OSSL_STORE,(r)) -# define FIPSerr(f,r) ERR_raise(ERR_LIB_FIPS,(r)) -# define CMSerr(f,r) ERR_raise(ERR_LIB_CMS,(r)) -# define CRMFerr(f,r) ERR_raise(ERR_LIB_CRMF,(r)) -# define CMPerr(f,r) ERR_raise(ERR_LIB_CMP,(r)) -# define TSerr(f,r) ERR_raise(ERR_LIB_TS,(r)) -# define HMACerr(f,r) ERR_raise(ERR_LIB_HMAC,(r)) -# define CTerr(f,r) ERR_raise(ERR_LIB_CT,(r)) -# define ASYNCerr(f,r) ERR_raise(ERR_LIB_ASYNC,(r)) -# define SM2err(f,r) ERR_raise(ERR_LIB_SM2,(r)) -# define ESSerr(f,r) ERR_raise(ERR_LIB_ESS,(r)) -# define PROPerr(f,r) ERR_raise(ERR_LIB_PROP,(r)) -# define PROVerr(f,r) ERR_raise(ERR_LIB_PROV,(r)) # define ERR_PACK(l,f,r) ( \ (((unsigned int)(l) & 0x0FF) << 24L) | \ |