From: Richard Levitte <levitte@openssl.org>
Date: Wed, 4 Nov 2020 15:28:09 +0000 (+0100)
Subject: Really deprecate the old NAMEerr() macros
X-Git-Tag: openssl-3.0.0-alpha9~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b06e70b868cb8067746e35ea90b714e2f8db7141;p=thirdparty%2Fopenssl.git

Really deprecate the old NAMEerr() macros

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13320)
---

diff --git a/include/openssl/err.h.in b/include/openssl/err.h.in
index 0e6f4fbad29..35db02fad66 100644
--- a/include/openssl/err.h.in
+++ b/include/openssl/err.h.in
@@ -123,7 +123,7 @@ struct err_state_st {
 
 # define ERR_LIB_USER            128
 
-# if 1 || !defined(OPENSSL_NO_DEPRECATED_3_0)
+# ifndef OPENSSL_NO_DEPRECATED_3_0
 #  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)