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/engine | |
| parent | GitHub CI: Separate no-deprecated job from minimal job (diff) | |
| download | openssl-3a1ee3c1993c588a22cb80f1d0eb6237f83a1560.tar.xz openssl-3a1ee3c1993c588a22cb80f1d0eb6237f83a1560.zip | |
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/engine')
| -rw-r--r-- | crypto/engine/eng_fat.c | 4 | ||||
| -rw-r--r-- | crypto/engine/eng_list.c | 2 | ||||
| -rw-r--r-- | crypto/engine/eng_openssl.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index 78537057b7..0cf27715c5 100644 --- a/crypto/engine/eng_fat.c +++ b/crypto/engine/eng_fat.c @@ -20,10 +20,8 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags) return 0; if ((flags & ENGINE_METHOD_DIGESTS) && !ENGINE_set_default_digests(e)) return 0; -#ifndef OPENSSL_NO_RSA if ((flags & ENGINE_METHOD_RSA) && !ENGINE_set_default_RSA(e)) return 0; -#endif #ifndef OPENSSL_NO_DSA if ((flags & ENGINE_METHOD_DSA) && !ENGINE_set_default_DSA(e)) return 0; @@ -96,9 +94,7 @@ int ENGINE_register_complete(ENGINE *e) { ENGINE_register_ciphers(e); ENGINE_register_digests(e); -#ifndef OPENSSL_NO_RSA ENGINE_register_RSA(e); -#endif #ifndef OPENSSL_NO_DSA ENGINE_register_DSA(e); #endif diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index de3475fe22..be08804665 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -250,9 +250,7 @@ static void engine_cpy(ENGINE *dest, const ENGINE *src) { dest->id = src->id; dest->name = src->name; -#ifndef OPENSSL_NO_RSA dest->rsa_meth = src->rsa_meth; -#endif #ifndef OPENSSL_NO_DSA dest->dsa_meth = src->dsa_meth; #endif diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index 4214ebdfda..3ca95abc13 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -98,9 +98,7 @@ static int bind_helper(ENGINE *e) || !ENGINE_set_name(e, engine_openssl_name) || !ENGINE_set_destroy_function(e, openssl_destroy) #ifndef TEST_ENG_OPENSSL_NO_ALGORITHMS -# ifndef OPENSSL_NO_RSA || !ENGINE_set_RSA(e, RSA_get_default_method()) -# endif # ifndef OPENSSL_NO_DSA || !ENGINE_set_DSA(e, DSA_get_default_method()) # endif |