diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-12-17 21:37:15 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-20 12:19:42 +0100 |
| commit | 3a1ee3c1993c588a22cb80f1d0eb6237f83a1560 (patch) | |
| tree | 3e915497790f85855ef9730b2d36bc97a688a9f4 /crypto/asn1 | |
| parent | e3577adddf6bc4f0d9d202621a2c576d982d6f0a (diff) | |
| download | openssl-3a1ee3c1993c588a22cb80f1d0eb6237f83a1560.tar.gz | |
Drop OPENSSL_NO_RSA everywhere
The configuration option 'no-rsa' was dropped with OpenSSL 1.1.0, so
this is simply a cleanup of the remains.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13700)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/asn1_item_list.h | 4 | ||||
| -rw-r--r-- | crypto/asn1/d2i_pu.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/i2d_evp.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/standard_methods.h | 4 |
4 files changed, 1 insertions, 11 deletions
diff --git a/crypto/asn1/asn1_item_list.h b/crypto/asn1/asn1_item_list.h index b5a8661bd4..01d9076350 100644 --- a/crypto/asn1/asn1_item_list.h +++ b/crypto/asn1/asn1_item_list.h @@ -134,13 +134,11 @@ static ASN1_ITEM_EXP *asn1_item_list[] = { ASN1_ITEM_ref(POLICY_MAPPING), ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION), ASN1_ITEM_ref(PROXY_POLICY), -#ifndef OPENSSL_NO_RSA -# ifndef OPENSSL_NO_DEPRECATED_3_0 +#ifndef OPENSSL_NO_DEPRECATED_3_0 ASN1_ITEM_ref(RSAPrivateKey), ASN1_ITEM_ref(RSAPublicKey), ASN1_ITEM_ref(RSA_OAEP_PARAMS), ASN1_ITEM_ref(RSA_PSS_PARAMS), -# endif #endif #ifndef OPENSSL_NO_SCRYPT ASN1_ITEM_ref(SCRYPT_PARAMS), diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c index 6b3506e314..b6c7da772c 100644 --- a/crypto/asn1/d2i_pu.c +++ b/crypto/asn1/d2i_pu.c @@ -44,14 +44,12 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp, } switch (EVP_PKEY_id(ret)) { -#ifndef OPENSSL_NO_RSA case EVP_PKEY_RSA: if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL, pp, length)) == NULL) { ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB); goto err; } break; -#endif #ifndef OPENSSL_NO_DSA case EVP_PKEY_DSA: /* TMP UGLY CAST */ diff --git a/crypto/asn1/i2d_evp.c b/crypto/asn1/i2d_evp.c index 3df49a1701..599c512901 100644 --- a/crypto/asn1/i2d_evp.c +++ b/crypto/asn1/i2d_evp.c @@ -107,10 +107,8 @@ int i2d_PublicKey(const EVP_PKEY *a, unsigned char **pp) return i2d_provided(a, EVP_PKEY_PUBLIC_KEY, output_structures, pp); } switch (EVP_PKEY_id(a)) { -#ifndef OPENSSL_NO_RSA case EVP_PKEY_RSA: return i2d_RSAPublicKey(EVP_PKEY_get0_RSA(a), pp); -#endif #ifndef OPENSSL_NO_DSA case EVP_PKEY_DSA: return i2d_DSAPublicKey(EVP_PKEY_get0_DSA(a), pp); diff --git a/crypto/asn1/standard_methods.h b/crypto/asn1/standard_methods.h index 59fa726991..7d225b308a 100644 --- a/crypto/asn1/standard_methods.h +++ b/crypto/asn1/standard_methods.h @@ -13,10 +13,8 @@ * is used to search it. */ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { -#ifndef OPENSSL_NO_RSA &rsa_asn1_meths[0], &rsa_asn1_meths[1], -#endif #ifndef OPENSSL_NO_DH &dh_asn1_meth, #endif @@ -30,9 +28,7 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = { #ifndef OPENSSL_NO_EC &eckey_asn1_meth, #endif -#ifndef OPENSSL_NO_RSA &rsa_pss_asn1_meth, -#endif #ifndef OPENSSL_NO_DH &dhx_asn1_meth, #endif |