From dbd66443208cb0928b93bce04e32de412d452aff Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Fri, 5 Jul 2019 15:50:50 +0200 Subject: [PATCH] Remove OPENSSL_X509V3_H include detector from openssl/cms.h The check is redundant, because is included. Reviewed-by: Richard Levitte Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/9364) --- crypto/cms/cms_lcl.h | 3 --- include/openssl/cms.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/crypto/cms/cms_lcl.h b/crypto/cms/cms_lcl.h index dbc329d118..08f086b589 100644 --- a/crypto/cms/cms_lcl.h +++ b/crypto/cms/cms_lcl.h @@ -317,8 +317,6 @@ struct CMS_OtherKeyAttribute_st { /* ESS structures */ -# ifdef HEADER_X509V3_H - struct CMS_ReceiptRequest_st { ASN1_OCTET_STRING *signedContentIdentifier; CMS_ReceiptsFrom *receiptsFrom; @@ -332,7 +330,6 @@ struct CMS_ReceiptsFrom_st { STACK_OF(GENERAL_NAMES) *receiptList; } d; }; -# endif struct CMS_Receipt_st { int32_t version; diff --git a/include/openssl/cms.h b/include/openssl/cms.h index e8653d7fc2..64002e4d46 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h @@ -288,8 +288,6 @@ void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid, int CMS_add1_signing_cert(CMS_SignerInfo *si, ESS_SIGNING_CERT *sc); int CMS_add1_signing_cert_v2(CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *sc); -# 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, @@ -302,7 +300,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); -- 2.25.1