From 1bcbf658a6ae99281b2b1c602b1076ea6af8d639 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Tue, 28 Feb 2017 09:48:32 +0100 Subject: Fix handling of EVP_PKEY_CTRL_PKCS7_ENCRYPT/DECRYPT with OPENSSL_NO_CMS. Reviewed-by: Stephen Henson Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2764) --- crypto/rsa/rsa_pmeth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crypto') 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); -- cgit v1.2.3