2 files changed, 2 insertions, 39 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c
index b66c749293..8faddcee1c 100644
--- a/src/lib/libcrypto/rsa/rsa_ameth.c
+++ b/src/lib/libcrypto/rsa/rsa_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_ameth.c,v 1.15 2015/12/03 23:03:10 beck Exp $ */
+/* $OpenBSD: rsa_ameth.c,v 1.16 2016/10/19 16:49:11 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -66,9 +66,6 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 
-#ifndef OPENSSL_NO_CMS
-#include <openssl/cms.h>
-#endif
 
 #include "asn1_locl.h"
 
@@ -420,17 +417,6 @@ rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
                 if (arg1 == 0)
                         PKCS7_RECIP_INFO_get0_alg(arg2, &alg);
                 break;
-#ifndef OPENSSL_NO_CMS
-        case ASN1_PKEY_CTRL_CMS_SIGN:
-                if (arg1 == 0)
-                        CMS_SignerInfo_get0_algs(arg2, NULL, NULL, NULL, &alg);
-                break;
-
-        case ASN1_PKEY_CTRL_CMS_ENVELOPE:
-                if (arg1 == 0)
-                        CMS_RecipientInfo_ktri_get0_algs(arg2, NULL, NULL, &alg);
-                break;
-#endif
 
         case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
                 *(int *)arg2 = NID_sha1;
diff --git a/src/lib/libcrypto/rsa/rsa_pmeth.c b/src/lib/libcrypto/rsa/rsa_pmeth.c
index 0b648138ee..4b7fc09514 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.17 2015/06/20 01:07:25 doug Exp $ */
+/* $OpenBSD: rsa_pmeth.c,v 1.18 2016/10/19 16:49:11 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -69,9 +69,6 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 
-#ifndef OPENSSL_NO_CMS
-#include <openssl/cms.h>
-#endif
 
 #include "evp_locl.h"
 #include "rsa_locl.h"
@@ -451,26 +448,6 @@ bad_pad:
         case EVP_PKEY_CTRL_PKCS7_DECRYPT:
         case EVP_PKEY_CTRL_PKCS7_SIGN:
                 return 1;
-#ifndef OPENSSL_NO_CMS
-        case EVP_PKEY_CTRL_CMS_DECRYPT:
-                {
-                        X509_ALGOR *alg = NULL;
-                        ASN1_OBJECT *encalg = NULL;
-
-                        if (p2)
-                                CMS_RecipientInfo_ktri_get0_algs(p2, NULL,
-                                    NULL, &alg);
-                        if (alg)
-                                X509_ALGOR_get0(&encalg, NULL, NULL, alg);
-                        if (encalg && OBJ_obj2nid(encalg) == NID_rsaesOaep)
-                                rctx->pad_mode = RSA_PKCS1_OAEP_PADDING;
-                }
-                /* FALLTHROUGH */
-
-        case EVP_PKEY_CTRL_CMS_ENCRYPT:
-        case EVP_PKEY_CTRL_CMS_SIGN:
-                return 1;
-#endif
         case EVP_PKEY_CTRL_PEER_KEY:
                 RSAerr(RSA_F_PKEY_RSA_CTRL,
                     RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);