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/cms/cms_dh.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/cms/cms_dh.c')
| -rw-r--r-- | crypto/cms/cms_dh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cms/cms_dh.c b/crypto/cms/cms_dh.c index 90b439dd35..9cba6364d1 100644 --- a/crypto/cms/cms_dh.c +++ b/crypto/cms/cms_dh.c @@ -148,13 +148,13 @@ static int dh_cms_decrypt(CMS_RecipientInfo *ri) if (alg == NULL || pubkey == NULL) return 0; if (!dh_cms_set_peerkey(pctx, alg, pubkey)) { - ERR_raise(ERR_LIB_DH, DH_R_PEER_KEY_ERROR); + ERR_raise(ERR_LIB_CMS, CMS_R_PEER_KEY_ERROR); return 0; } } /* Set DH derivation parameters and initialise unwrap context */ if (!dh_cms_set_shared_info(pctx, ri)) { - ERR_raise(ERR_LIB_DH, DH_R_SHARED_INFO_ERROR); + ERR_raise(ERR_LIB_CMS, CMS_R_SHARED_INFO_ERROR); return 0; } return 1; |