diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2015-02-11 03:55:43 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2015-02-11 03:55:43 +0000 |
| commit | aeaac866c83fd4383009cd21727c6c48c8865291 (patch) | |
| tree | f4fe7cdccd6a8aa4e163c7d3261063aae7366ed2 /lib/libcrypto/dsa | |
| parent | fe6ccaf8cdf12c034bd9e4d92a358e0ba8fa116a (diff) | |
get rid of OPENSSL_NO_CMS code we do not use.
ok miod@
Diffstat (limited to 'lib/libcrypto/dsa')
| -rw-r--r-- | lib/libcrypto/dsa/dsa_ameth.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/lib/libcrypto/dsa/dsa_ameth.c b/lib/libcrypto/dsa/dsa_ameth.c index 20839b6207e..8f7a73a4813 100644 --- a/lib/libcrypto/dsa/dsa_ameth.c +++ b/lib/libcrypto/dsa/dsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_ameth.c,v 1.14 2014/07/13 12:45:01 miod Exp $ */ +/* $OpenBSD: dsa_ameth.c,v 1.15 2015/02/11 03:55:42 beck 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" @@ -595,26 +592,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; |