diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-02-28 09:48:32 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-28 15:28:18 -0500 |
| commit | 1bcbf658a6ae99281b2b1c602b1076ea6af8d639 (patch) | |
| tree | 6d076ead77151c86d255d088d9b471599544c86a /crypto | |
| parent | a00b9560f7ece1e51bd7a8dc6a7ffb7a3d20cf86 (diff) | |
Fix handling of EVP_PKEY_CTRL_PKCS7_ENCRYPT/DECRYPT with OPENSSL_NO_CMS.
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2764)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rsa/rsa_pmeth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index d4b278ba50..0292b26e6c 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -553,9 +553,10 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) #ifndef OPENSSL_NO_CMS case EVP_PKEY_CTRL_CMS_DECRYPT: case EVP_PKEY_CTRL_CMS_ENCRYPT: +#endif if (!pkey_ctx_is_pss(ctx)) return 1; -#endif + /* fall through */ case EVP_PKEY_CTRL_PEER_KEY: RSAerr(RSA_F_PKEY_RSA_CTRL, RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE); |