diff options
author | joshua <> | 2024-03-30 00:35:15 +0000 |
---|---|---|
committer | joshua <> | 2024-03-30 00:35:15 +0000 |
commit | 0ec9ff0c1e847d54b79c84237ed21fe4ab857b7c (patch) | |
tree | 71b11f1dd20e4684ba3e8eaf08425e8608e1a730 | |
parent | 3f3d01ee1adbde5778d7bbb3ee9c212549cc0678 (diff) | |
download | openbsd-0ec9ff0c1e847d54b79c84237ed21fe4ab857b7c.tar.gz openbsd-0ec9ff0c1e847d54b79c84237ed21fe4ab857b7c.tar.bz2 openbsd-0ec9ff0c1e847d54b79c84237ed21fe4ab857b7c.zip |
Remove pointless guard in cms header
ok jsing
-rw-r--r-- | src/lib/libcrypto/cms/cms.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/cms/cms.h b/src/lib/libcrypto/cms/cms.h index 75983cee3e..90030bdde0 100644 --- a/src/lib/libcrypto/cms/cms.h +++ b/src/lib/libcrypto/cms/cms.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms.h,v 1.17 2024/03/29 02:28:50 jsing Exp $ */ | 1 | /* $OpenBSD: cms.h,v 1.18 2024/03/30 00:35:15 joshua Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -315,8 +315,6 @@ int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si, const char *attrname, | |||
315 | void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid, | 315 | void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid, |
316 | int lastpos, int type); | 316 | int lastpos, int type); |
317 | 317 | ||
318 | #ifdef HEADER_X509V3_H | ||
319 | |||
320 | int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr); | 318 | int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr); |
321 | CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen, | 319 | CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen, |
322 | int allorfirst, STACK_OF(GENERAL_NAMES) *receiptList, | 320 | int allorfirst, STACK_OF(GENERAL_NAMES) *receiptList, |
@@ -325,7 +323,7 @@ int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr); | |||
325 | void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr, ASN1_STRING **pcid, | 323 | void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr, ASN1_STRING **pcid, |
326 | int *pallorfirst, STACK_OF(GENERAL_NAMES) **plist, | 324 | int *pallorfirst, STACK_OF(GENERAL_NAMES) **plist, |
327 | STACK_OF(GENERAL_NAMES) **prto); | 325 | STACK_OF(GENERAL_NAMES) **prto); |
328 | #endif | 326 | |
329 | int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri, X509_ALGOR **palg, | 327 | int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri, X509_ALGOR **palg, |
330 | ASN1_OCTET_STRING **pukm); | 328 | ASN1_OCTET_STRING **pukm); |
331 | STACK_OF(CMS_RecipientEncryptedKey) * | 329 | STACK_OF(CMS_RecipientEncryptedKey) * |