unifdef OPENSSL_NO_CMS

8 files changed, 8 insertions, 123 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_ameth.c b/src/lib/libcrypto/dsa/dsa_ameth.c
index a6e21a688e..3e434701aa 100644
--- a/src/lib/libcrypto/dsa/dsa_ameth.c
+++ b/src/lib/libcrypto/dsa/dsa_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_ameth.c,v 1.19 2016/03/01 07:04:41 doug Exp $ */
+/* $OpenBSD: dsa_ameth.c,v 1.20 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/err.h>
 #include <openssl/x509.h>
 
-#ifndef OPENSSL_NO_CMS
-#include <openssl/cms.h>
-#endif
 
 #include "asn1_locl.h"
 
@@ -606,26 +603,6 @@ dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
                             0);
                 }
                 return 1;
-#ifndef OPENSSL_NO_CMS
-        case ASN1_PKEY_CTRL_CMS_SIGN:
-                if (arg1 == 0) {
-                        int snid, hnid;
-                        X509_ALGOR *alg1, *alg2;
-
-                        CMS_SignerInfo_get0_algs(arg2, NULL, NULL, &alg1, &alg2);
-                        if (alg1 == NULL || alg1->algorithm == NULL)
-                                return -1;
-                        hnid = OBJ_obj2nid(alg1->algorithm);
-                        if (hnid == NID_undef)
-                                return -1;
-                        if (!OBJ_find_sigid_by_algs(&snid, hnid,
-                            EVP_PKEY_id(pkey)))
-                                return -1; 
-                        X509_ALGOR_set0(alg2, OBJ_nid2obj(snid), V_ASN1_UNDEF,
-                            0);
-                }
-                return 1;
-#endif
 
         case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
                 *(int *)arg2 = NID_sha1;
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index dd1c31883e..0dab68d5fe 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_ameth.c,v 1.16 2015/02/11 04:05:14 beck Exp $ */
+/* $OpenBSD: ec_ameth.c,v 1.17 2016/10/19 16:49:11 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -65,9 +65,6 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
-#ifndef OPENSSL_NO_CMS
-#include <openssl/cms.h>
-#endif
 
 #include "asn1_locl.h"
 
@@ -573,24 +570,6 @@ ec_pkey_ctrl(EVP_PKEY * pkey, int op, long arg1, void *arg2)
                         X509_ALGOR_set0(alg2, OBJ_nid2obj(snid), V_ASN1_UNDEF, 0);
                 }
                 return 1;
-#ifndef OPENSSL_NO_CMS
-        case ASN1_PKEY_CTRL_CMS_SIGN:
-                if (arg1 == 0) {
-                        int snid, hnid;
-                        X509_ALGOR *alg1, *alg2;
-                        CMS_SignerInfo_get0_algs(arg2, NULL, NULL,
-                            &alg1, &alg2);
-                        if (alg1 == NULL || alg1->algorithm == NULL)
-                                return -1;
-                        hnid = OBJ_obj2nid(alg1->algorithm);
-                        if (hnid == NID_undef)
-                                return -1;
-                        if (!OBJ_find_sigid_by_algs(&snid, hnid, EVP_PKEY_id(pkey)))
-                                return -1;
-                        X509_ALGOR_set0(alg2, OBJ_nid2obj(snid), V_ASN1_UNDEF, 0);
-                }
-                return 1;
-#endif
 
         case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
                 *(int *) arg2 = NID_sha1;
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index 58adce64e7..40009cbe88 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err_all.c,v 1.22 2015/02/11 04:05:14 beck Exp $ */
+/* $OpenBSD: err_all.c,v 1.23 2016/10/19 16:49:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,9 +78,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#ifndef OPENSSL_NO_CMS
-#include <openssl/cms.h>
-#endif
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
@@ -151,9 +148,6 @@ ERR_load_crypto_strings(void)
 #endif
         ERR_load_OCSP_strings();
         ERR_load_UI_strings();
-#ifndef OPENSSL_NO_CMS
-        ERR_load_CMS_strings();
-#endif
 #ifndef OPENSSL_NO_GOST
         ERR_load_GOST_strings();
 #endif
diff --git a/src/lib/libcrypto/gost/gostr341001_ameth.c b/src/lib/libcrypto/gost/gostr341001_ameth.c
index 3153d2f2eb..bb569ea846 100644
--- a/src/lib/libcrypto/gost/gostr341001_ameth.c
+++ b/src/lib/libcrypto/gost/gostr341001_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_ameth.c,v 1.9 2015/02/14 06:40:04 jsing Exp $ */
+/* $OpenBSD: gostr341001_ameth.c,v 1.10 2016/10/19 16:49:11 jsing Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -61,9 +61,6 @@
 #include <openssl/x509.h>
 #include <openssl/gost.h>
 
-#ifndef OPENSSL_NO_CMS
-#include <openssl/cms.h>
-#endif
 
 #include "asn1_locl.h"
 #include "gost_locl.h"
@@ -656,17 +653,6 @@ pkey_ctrl_gost01(EVP_PKEY *pkey, int op, long arg1, void *arg2)
                 if (arg1 == 0)
                         PKCS7_RECIP_INFO_get0_alg(arg2, &alg3);
                 break;
-#ifndef OPENSSL_NO_CMS
-        case ASN1_PKEY_CTRL_CMS_SIGN:
-                if (arg1 == 0)
-                        CMS_SignerInfo_get0_algs(arg2, NULL, NULL, &alg1, &alg2);
-                break;
-
-        case ASN1_PKEY_CTRL_CMS_ENVELOPE:
-                if (arg1 == 0)
-                        CMS_RecipientInfo_ktri_get0_algs(arg2, NULL, NULL, &alg3);
-                break;
-#endif
         case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
                 *(int *)arg2 = GostR3410_get_md_digest(digest);
                 return 2;
diff --git a/src/lib/libcrypto/gost/gostr341001_pmeth.c b/src/lib/libcrypto/gost/gostr341001_pmeth.c
index 1454f3f0a2..30a066612f 100644
--- a/src/lib/libcrypto/gost/gostr341001_pmeth.c
+++ b/src/lib/libcrypto/gost/gostr341001_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_pmeth.c,v 1.12 2015/02/14 15:08:37 miod Exp $ */
+/* $OpenBSD: gostr341001_pmeth.c,v 1.13 2016/10/19 16:49:11 jsing Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -598,11 +598,6 @@ pkey_gost01_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         case EVP_PKEY_CTRL_PKCS7_DECRYPT:
         case EVP_PKEY_CTRL_PKCS7_SIGN:
         case EVP_PKEY_CTRL_DIGESTINIT:
-#ifndef OPENSSL_NO_CMS
-        case EVP_PKEY_CTRL_CMS_ENCRYPT:
-        case EVP_PKEY_CTRL_CMS_DECRYPT:
-        case EVP_PKEY_CTRL_CMS_SIGN:
-#endif
                 return 1;
 
         case EVP_PKEY_CTRL_GOST_PARAMSET:
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 852b0eaf86..7178c8744f 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_lib.c,v 1.42 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: pem_lib.c,v 1.43 2016/10/19 16:49:11 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -265,15 +265,6 @@ check_pem(const char *nm, const char *name)
             !strcmp(name, PEM_STRING_PKCS7))
                 return 1;
 
-#ifndef OPENSSL_NO_CMS
-        if (!strcmp(nm, PEM_STRING_X509) &&
-            !strcmp(name, PEM_STRING_CMS))
-                return 1;
-        /* Allow CMS to be read from PKCS#7 headers */
-        if (!strcmp(nm, PEM_STRING_PKCS7) &&
-            !strcmp(name, PEM_STRING_CMS))
-                return 1;
-#endif
 
         return 0;
 }
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);