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 | |
| 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')
| -rw-r--r-- | crypto/evp/digest.c | 6 | ||||
| -rw-r--r-- | crypto/evp/evp_lib.c | 4 | ||||
| -rw-r--r-- | crypto/evp/pmeth_lib.c | 4 |
3 files changed, 1 insertions, 13 deletions
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index b0ce61f935..1d16c52060 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -94,12 +94,8 @@ EVP_MD_CTX *evp_md_ctx_new_ex(EVP_PKEY *pkey, const ASN1_OCTET_STRING *id, goto err; } -# ifndef OPENSSL_NO_EC - if (id != NULL && EVP_PKEY_CTX_set1_id(pctx, id->data, id->length) <= 0) { - ERR_raise(ERR_LIB_ASN1, ERR_R_MALLOC_FAILURE); + if (id != NULL && EVP_PKEY_CTX_set1_id(pctx, id->data, id->length) <= 0) goto err; - } -# endif EVP_MD_CTX_set_pkey_ctx(ctx, pctx); return ctx; 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); diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index 3823855008..f817173555 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -1266,7 +1266,6 @@ static int legacy_ctrl_to_param(EVP_PKEY_CTX *ctx, int keytype, int optype, return EVP_PKEY_CTX_set_dh_rfc5114(ctx, p1); } } -# ifndef OPENSSL_NO_DSA if (keytype == EVP_PKEY_DSA) { switch (cmd) { case EVP_PKEY_CTRL_DSA_PARAMGEN_BITS: @@ -1277,7 +1276,6 @@ static int legacy_ctrl_to_param(EVP_PKEY_CTX *ctx, int keytype, int optype, return EVP_PKEY_CTX_set_dsa_paramgen_md(ctx, p2); } } -# endif if (keytype == EVP_PKEY_EC) { switch (cmd) { case EVP_PKEY_CTRL_EC_PARAM_ENC: @@ -1543,14 +1541,12 @@ static int legacy_ctrl_str_to_param(EVP_PKEY_CTX *ctx, const char *name, name = OSSL_PKEY_PARAM_RSA_MGF1_DIGEST; else if (strcmp(name, "rsa_pss_keygen_saltlen") == 0) name = OSSL_PKEY_PARAM_RSA_PSS_SALTLEN; -# ifndef OPENSSL_NO_DSA else if (strcmp(name, "dsa_paramgen_bits") == 0) name = OSSL_PKEY_PARAM_FFC_PBITS; else if (strcmp(name, "dsa_paramgen_q_bits") == 0) name = OSSL_PKEY_PARAM_FFC_QBITS; else if (strcmp(name, "dsa_paramgen_md") == 0) name = OSSL_PKEY_PARAM_FFC_DIGEST; -# endif else if (strcmp(name, "dh_paramgen_generator") == 0) name = OSSL_PKEY_PARAM_DH_GENERATOR; else if (strcmp(name, "dh_paramgen_prime_len") == 0) |