summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/rsa/rsa_ameth.c
diff options
context:
space:
mode:
authorjsing <>2016-10-19 16:49:11 +0000
committerjsing <>2016-10-19 16:49:11 +0000
commit32993d77e030496e89e508d70d0fb7a85cd0787f (patch)
tree3232d4e14c244b635cf7b2be923782ede6e3f4b0 /src/lib/libcrypto/rsa/rsa_ameth.c
parentbf2e4fbd312b229ea2846ec4cb8bc0c0222e4850 (diff)
downloadopenbsd-32993d77e030496e89e508d70d0fb7a85cd0787f.tar.gz
openbsd-32993d77e030496e89e508d70d0fb7a85cd0787f.tar.bz2
openbsd-32993d77e030496e89e508d70d0fb7a85cd0787f.zip
unifdef OPENSSL_NO_CMS
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/rsa/rsa_ameth.c16
1 files changed, 1 insertions, 15 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 @@
1/* $OpenBSD: rsa_ameth.c,v 1.15 2015/12/03 23:03:10 beck Exp $ */ 1/* $OpenBSD: rsa_ameth.c,v 1.16 2016/10/19 16:49:11 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -66,9 +66,6 @@
66#include <openssl/rsa.h> 66#include <openssl/rsa.h>
67#include <openssl/x509.h> 67#include <openssl/x509.h>
68 68
69#ifndef OPENSSL_NO_CMS
70#include <openssl/cms.h>
71#endif
72 69
73#include "asn1_locl.h" 70#include "asn1_locl.h"
74 71
@@ -420,17 +417,6 @@ rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
420 if (arg1 == 0) 417 if (arg1 == 0)
421 PKCS7_RECIP_INFO_get0_alg(arg2, &alg); 418 PKCS7_RECIP_INFO_get0_alg(arg2, &alg);
422 break; 419 break;
423#ifndef OPENSSL_NO_CMS
424 case ASN1_PKEY_CTRL_CMS_SIGN:
425 if (arg1 == 0)
426 CMS_SignerInfo_get0_algs(arg2, NULL, NULL, NULL, &alg);
427 break;
428
429 case ASN1_PKEY_CTRL_CMS_ENVELOPE:
430 if (arg1 == 0)
431 CMS_RecipientInfo_ktri_get0_algs(arg2, NULL, NULL, &alg);
432 break;
433#endif
434 420
435 case ASN1_PKEY_CTRL_DEFAULT_MD_NID: 421 case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
436 *(int *)arg2 = NID_sha1; 422 *(int *)arg2 = NID_sha1;