diff options
| author | Rich Salz <rsalz@akamai.com> | 2021-01-28 10:17:13 -0500 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-02-02 11:47:49 +0100 |
| commit | 7ff9fdd4b31757f70080bd3fa2e633ca080408a4 (patch) | |
| tree | f01db1c3029defd6101689d130456779878b976a /include | |
| parent | d3372c2f35495d0c61ab09daf7fba3ecbbb595aa (diff) | |
| download | openssl-7ff9fdd4b31757f70080bd3fa2e633ca080408a4.tar.gz | |
Deprecate X509_certificate_type
Fixes: #13997
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14002)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 22 | ||||
| -rw-r--r-- | include/openssl/x509.h.in | 3 |
2 files changed, 14 insertions, 11 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 68f2543a60..3b967202da 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -37,16 +37,18 @@ # include <openssl/objects.h> -# define EVP_PK_RSA 0x0001 -# define EVP_PK_DSA 0x0002 -# define EVP_PK_DH 0x0004 -# define EVP_PK_EC 0x0008 -# define EVP_PKT_SIGN 0x0010 -# define EVP_PKT_ENC 0x0020 -# define EVP_PKT_EXCH 0x0040 -# define EVP_PKS_RSA 0x0100 -# define EVP_PKS_DSA 0x0200 -# define EVP_PKS_EC 0x0400 +# ifndef OPENSSL_NO_DEPRECATED_3_0 +# define EVP_PK_RSA 0x0001 +# define EVP_PK_DSA 0x0002 +# define EVP_PK_DH 0x0004 +# define EVP_PK_EC 0x0008 +# define EVP_PKT_SIGN 0x0010 +# define EVP_PKT_ENC 0x0020 +# define EVP_PKT_EXCH 0x0040 +# define EVP_PKS_RSA 0x0100 +# define EVP_PKS_DSA 0x0200 +# define EVP_PKS_EC 0x0400 +# endif # define EVP_PKEY_NONE NID_undef # define EVP_PKEY_RSA NID_rsaEncryption diff --git a/include/openssl/x509.h.in b/include/openssl/x509.h.in index 8a3cb2e4d0..7aef798e5b 100644 --- a/include/openssl/x509.h.in +++ b/include/openssl/x509.h.in @@ -726,7 +726,6 @@ const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x); EVP_PKEY *X509_get0_pubkey(const X509 *x); EVP_PKEY *X509_get_pubkey(X509 *x); ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x); -int X509_certificate_type(const X509 *x, const EVP_PKEY *pubkey); long X509_REQ_get_version(const X509_REQ *req); int X509_REQ_set_version(X509_REQ *x, long version); @@ -838,6 +837,8 @@ int X509_cmp(const X509 *a, const X509 *b); int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b); #ifndef OPENSSL_NO_DEPRECATED_3_0 # define X509_NAME_hash(x) X509_NAME_hash_ex(x, NULL, NULL, NULL) +OSSL_DEPRECATEDIN_3_0 int X509_certificate_type(const X509 *x, + const EVP_PKEY *pubkey); #endif unsigned long X509_NAME_hash_ex(const X509_NAME *x, OSSL_LIB_CTX *libctx, const char *propq, int *ok); |