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 /apps/req.c | |
| parent | e3577adddf6bc4f0d9d202621a2c576d982d6f0a (diff) | |
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 'apps/req.c')
| -rw-r--r-- | apps/req.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/apps/req.c b/apps/req.c index 84b6a4c00c..acd0cd09cb 100644 --- a/apps/req.c +++ b/apps/req.c @@ -25,9 +25,7 @@ #include <openssl/pem.h> #include <openssl/bn.h> #include <openssl/lhash.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #ifndef OPENSSL_NO_DSA # include <openssl/dsa.h> #endif @@ -939,7 +937,6 @@ int req_main(int argc, char **argv) goto end; } fprintf(stdout, "Modulus="); -#ifndef OPENSSL_NO_RSA if (EVP_PKEY_is_a(tpubkey, "RSA")) { BIGNUM *n; @@ -947,9 +944,9 @@ int req_main(int argc, char **argv) EVP_PKEY_get_bn_param(pkey, "n", &n); BN_print(out, n); BN_free(n); - } else -#endif + } else { fprintf(stdout, "Wrong Algorithm type"); + } fprintf(stdout, "\n"); } @@ -1596,7 +1593,6 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr, EVP_PKEY_CTX_free(gctx); return NULL; } -#ifndef OPENSSL_NO_RSA if ((*pkey_type == EVP_PKEY_RSA) && (keylen != -1)) { if (EVP_PKEY_CTX_set_rsa_keygen_bits(gctx, keylen) <= 0) { BIO_puts(bio_err, "Error setting RSA keysize\n"); @@ -1605,7 +1601,6 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr, return NULL; } } -#endif return gctx; } |