summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoshua <joshua@cvs.openbsd.org>2024-03-30 00:35:16 +0000
committerjoshua <joshua@cvs.openbsd.org>2024-03-30 00:35:16 +0000
commitda303368a2699fed36c3c5d4388e586cae29dbe3 (patch)
treef6aa87a7b56afa08df990987b27b87221fc5e746
parent7fcd43e8613506b44011f6ecdb7775f6c3078602 (diff)
Remove pointless guard in cms header
ok jsing
-rw-r--r--lib/libcrypto/cms/cms.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libcrypto/cms/cms.h b/lib/libcrypto/cms/cms.h
index 75983cee3e8..90030bdde02 100644
--- a/lib/libcrypto/cms/cms.h
+++ b/lib/libcrypto/cms/cms.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms.h,v 1.17 2024/03/29 02:28:50 jsing Exp $ */
+/* $OpenBSD: cms.h,v 1.18 2024/03/30 00:35:15 joshua Exp $ */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@@ -315,8 +315,6 @@ int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname,
void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
int lastpos, int type);
-#ifdef HEADER_X509V3_H
-
int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
int allorfirst, STACK_OF(GENERAL_NAMES) *receiptList,
@@ -325,7 +323,7 @@ int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr);
void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr, ASN1_STRING **pcid,
int *pallorfirst, STACK_OF(GENERAL_NAMES) **plist,
STACK_OF(GENERAL_NAMES) **prto);
-#endif
+
int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri, X509_ALGOR **palg,
ASN1_OCTET_STRING **pukm);
STACK_OF(CMS_RecipientEncryptedKey) *