diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-13 17:13:01 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-27 11:04:54 +0000 |
| commit | 752419d8f7154995c355a38801d89230a80fa8a3 (patch) | |
| tree | 36725986fa6642317d5c04f8f95111607c8656e0 /include | |
| parent | abcca5078fc2b5059462bf6a9c659f235c11d5d8 (diff) | |
Deprecate DH_new as well as i2d_DHparams and d2i_DHparams
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13138)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/dh.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/openssl/dh.h b/include/openssl/dh.h index 69a5b79c18..86f0e73464 100644 --- a/include/openssl/dh.h +++ b/include/openssl/dh.h @@ -147,7 +147,7 @@ DEPRECATEDIN_3_0(const DH_METHOD *DH_get_default_method(void)) DEPRECATEDIN_3_0(int DH_set_method(DH *dh, const DH_METHOD *meth)) DEPRECATEDIN_3_0(DH *DH_new_method(ENGINE *engine)) -DH *DH_new(void); +DEPRECATEDIN_3_0(DH *DH_new(void)) void DH_free(DH *dh); int DH_up_ref(DH *dh); int DH_bits(const DH *dh); @@ -185,8 +185,12 @@ DEPRECATEDIN_3_0(int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)) DEPRECATEDIN_3_0(int DH_compute_key_padded(unsigned char *key, const BIGNUM *pub_key, DH *dh)) -DECLARE_ASN1_ENCODE_FUNCTIONS_only(DH, DHparams) -DECLARE_ASN1_ENCODE_FUNCTIONS_only(DH, DHxparams) + +# ifndef OPENSSL_NO_DEPRECATED_3_0 +DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0, DH, DHparams) +DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0, DH, DHxparams) +# endif + # ifndef OPENSSL_NO_STDIO DEPRECATEDIN_3_0(int DHparams_print_fp(FILE *fp, const DH *x)) # endif |