summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-07-05 15:50:50 +0200
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-07-24 17:08:38 +0200
commit19b7b64c7284dea373b454e14360e786ffca6375 (patch)
tree05d46391f9d1845238afe5a4f3c4c1a3510173aa /include
parentca066211a831e6fead672cf2fdc89a89e33f86d9 (diff)
Remove OPENSSL_X509V3_H include detector from openssl/cms.h
The check is redundant, because <openssl/x509v3.h> is included. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/9365)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/cms.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/openssl/cms.h b/include/openssl/cms.h
index ddf37e56f8..72d45d8c2c 100644
--- a/include/openssl/cms.h
+++ b/include/openssl/cms.h
@@ -284,8 +284,6 @@ int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
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,
@@ -298,7 +296,6 @@ void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
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);