From b4ad7fce0b14f9ef4208dc94f61501195356f2d4 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 31 Oct 2019 14:05:30 +0000
Subject: Add CMS controls for RSA.

---
 src/lib/libcrypto/rsa/rsa_pmeth.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/rsa/rsa_pmeth.c b/src/lib/libcrypto/rsa/rsa_pmeth.c
index 5fd6309298..008d425bd1 100644
--- a/src/lib/libcrypto/rsa/rsa_pmeth.c
+++ b/src/lib/libcrypto/rsa/rsa_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_pmeth.c,v 1.31 2019/10/31 13:56:29 jsing Exp $ */
+/* $OpenBSD: rsa_pmeth.c,v 1.32 2019/10/31 14:05:30 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -590,10 +590,17 @@ pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 
 	case EVP_PKEY_CTRL_DIGESTINIT:
 	case EVP_PKEY_CTRL_PKCS7_SIGN:
+#ifndef OPENSSL_NO_CMS
+	case EVP_PKEY_CTRL_CMS_SIGN:
+#endif
 		return 1;
 
 	case EVP_PKEY_CTRL_PKCS7_ENCRYPT:
 	case EVP_PKEY_CTRL_PKCS7_DECRYPT:
+#ifndef OPENSSL_NO_CMS
+	case EVP_PKEY_CTRL_CMS_DECRYPT:
+	case EVP_PKEY_CTRL_CMS_ENCRYPT:
+#endif
 		if (ctx->pmeth->pkey_id != EVP_PKEY_RSA_PSS)
 			return 1;
 
-- 
cgit v1.2.3-55-g6feb