The branch master has been updated
via 1bcbf658a6ae99281b2b1c602b1076ea6af8d639 (commit)
from a00b9560f7ece1e51bd7a8dc6a7ffb7a3d20cf86 (commit)
- Log -----------------------------------------------------------------
commit 1bcbf658a6ae99281b2b1c602b1076ea6af8d639
Author: Bernd Edlinger <[email protected]>
Date: Tue Feb 28 09:48:32 2017 +0100
Fix handling of EVP_PKEY_CTRL_PKCS7_ENCRYPT/DECRYPT with OPENSSL_NO_CMS.
Reviewed-by: Stephen Henson <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/2764)
-----------------------------------------------------------------------
Summary of changes:
crypto/rsa/rsa_pmeth.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index d4b278b..0292b26 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);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
