diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-14 17:12:38 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-27 11:04:54 +0000 |
| commit | 4d8e8a2d3781b6ca7c453492ee8e06885c812e73 (patch) | |
| tree | dd9caaffb3fa4882cc7ed41fdca57405e3251408 /include/openssl/pem.h | |
| parent | 5a2674163d99c755ea0eb09501b9eee99e145188 (diff) | |
| download | openssl-4d8e8a2d3781b6ca7c453492ee8e06885c812e73.zip openssl-4d8e8a2d3781b6ca7c453492ee8e06885c812e73.tar.gz openssl-4d8e8a2d3781b6ca7c453492ee8e06885c812e73.tar.bz2 | |
Deprecate the DHparams and DHxparams PEM routines
The functions return a DH object and therefore need to be deprecated.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13138)
Diffstat (limited to 'include/openssl/pem.h')
| -rw-r--r-- | include/openssl/pem.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 3dcf97e..b3c2d2e 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -391,8 +391,10 @@ DECLARE_PEM_rw_cb(ECPrivateKey, EC_KEY) DECLARE_PEM_rw(EC_PUBKEY, EC_KEY) # endif # ifndef OPENSSL_NO_DH -DECLARE_PEM_rw(DHparams, DH) -DECLARE_PEM_write(DHxparams, DH) +# ifndef OPENSSL_NO_DEPRECATED_3_0 +DECLARE_PEM_rw_attr(OSSL_DEPRECATEDIN_3_0, DHparams, DH) +DECLARE_PEM_write_attr(OSSL_DEPRECATEDIN_3_0, DHxparams, DH) +# endif # endif DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) EVP_PKEY *PEM_read_bio_PrivateKey_ex(BIO *bp, EVP_PKEY **x, |