diff options
Diffstat (limited to 'crypto/cms/cms_env.c')
| -rw-r--r-- | crypto/cms/cms_env.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index cedabe1f3c..15ebe1b86b 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -115,17 +115,11 @@ int cms_env_asn1_ctrl(CMS_RecipientInfo *ri, int cmd) } else return 0; -#ifndef OPENSSL_NO_DH if (EVP_PKEY_is_a(pkey, "DHX")) return cms_dh_envelope(ri, cmd); - else -#endif -#ifndef OPENSSL_NO_EC - if (EVP_PKEY_is_a(pkey, "EC")) + else if (EVP_PKEY_is_a(pkey, "EC")) return cms_ecdh_envelope(ri, cmd); - else -#endif - if (EVP_PKEY_is_a(pkey, "RSA")) + else if (EVP_PKEY_is_a(pkey, "RSA")) return cms_rsa_envelope(ri, cmd); /* Something else? We'll give engines etc a chance to handle this */ |