diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-20 10:07:54 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-04 20:44:24 +0100 |
| commit | be8e9b39a32d6eae59f8b7eab48e9535bd4e9bb2 (patch) | |
| tree | ff887ee39a60d6de3df8c0b49162c8fcd43d3b79 /include/openssl/pkcs12.h.in | |
| parent | be5b2b64a559628dff876cfdf028308cbe6c7e2d (diff) | |
| download | openssl-be8e9b39a32d6eae59f8b7eab48e9535bd4e9bb2.zip openssl-be8e9b39a32d6eae59f8b7eab48e9535bd4e9bb2.tar.gz openssl-be8e9b39a32d6eae59f8b7eab48e9535bd4e9bb2.tar.bz2 | |
Switch deprecation method for PKCS#12
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)
Diffstat (limited to 'include/openssl/pkcs12.h.in')
| -rw-r--r-- | include/openssl/pkcs12.h.in | 6 |
1 files changed, 4 insertions, 2 deletions
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); |