From be8e9b39a32d6eae59f8b7eab48e9535bd4e9bb2 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 20 Nov 2020 10:07:54 +0100 Subject: Switch deprecation method for PKCS#12 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13460) --- include/openssl/pkcs12.h.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/openssl/pkcs12.h.in') diff --git a/include/openssl/pkcs12.h.in b/include/openssl/pkcs12.h.in index f829dc7..76b19d3 100644 --- a/include/openssl/pkcs12.h.in +++ b/include/openssl/pkcs12.h.in @@ -85,8 +85,10 @@ typedef struct pkcs12_bag_st PKCS12_BAGS; # define PKCS12_MAKE_SHKEYBAG PKCS12_SAFEBAG_create_pkcs8_encrypt #endif - -DEPRECATEDIN_1_1_0(ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, int attr_nid)) +#ifndef OPENSSL_NO_DEPRECATED_1_1_0 +OSSL_DEPRECATEDIN_1_1_0 ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, + int attr_nid); +#endif ASN1_TYPE *PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid); int PKCS12_mac_present(const PKCS12 *p12); -- cgit v1.1