diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-12-02 18:27:03 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-16 11:56:38 +0100 |
| commit | c2403f362efc519e473269d183adc7cceddb8c54 (patch) | |
| tree | 356a5fce1a987659345a60cf0abb30d8412b73e2 /crypto/evp/evp_lib.c | |
| parent | 565b33990cc03d757f493616c040addbedfc80f8 (diff) | |
Drop unnecessary checks of OPENSSL_NO_DH, OPENSSL_NO_DSA and OPENSSL_NO_EC
The apps, the CMS library and the X.509 library are primarly affected.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13589)
Diffstat (limited to 'crypto/evp/evp_lib.c')
| -rw-r--r-- | crypto/evp/evp_lib.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index 7947d05907..48fa330ac3 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -1008,20 +1008,16 @@ int EVP_PKEY_CTX_set_group_name(EVP_PKEY_CTX *ctx, const char *name) /* Could be a legacy key, try and convert to a ctrl */ if (ctx->pmeth != NULL && (nid = OBJ_txt2nid(name)) != NID_undef) { -# ifndef OPENSSL_NO_DH if (ctx->pmeth->pkey_id == EVP_PKEY_DH) return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN, EVP_PKEY_CTRL_DH_NID, nid, NULL); -# endif -# ifndef OPENSSL_NO_EC if (ctx->pmeth->pkey_id == EVP_PKEY_EC) return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_PARAMGEN|EVP_PKEY_OP_KEYGEN, EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, nid, NULL); -# endif } #endif ERR_raise(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED); |