unifdef OPENSSL_NO_CMS

1 files changed, 1 insertions, 24 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;