wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove OPENSSL_X509V3_H include detector from openssl/cms.h

Browse source 
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/9364)
This commit is contained in:
Dr. Matthias St. Pierre 2019-07-05 15:50:50 +02:00
parent b23217a144
commit dbd6644320
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crypto/cms/cms_lcl.h
View file

@ -317,8 +317,6 @@ struct CMS_OtherKeyAttribute_st {
/* ESS structures */ /* ESS structures */
# ifdef HEADER_X509V3_H
struct CMS_ReceiptRequest_st { struct CMS_ReceiptRequest_st {
ASN1_OCTET_STRING *signedContentIdentifier; ASN1_OCTET_STRING *signedContentIdentifier;
CMS_ReceiptsFrom *receiptsFrom; CMS_ReceiptsFrom *receiptsFrom;
@ -332,7 +330,6 @@ struct CMS_ReceiptsFrom_st {
STACK_OF(GENERAL_NAMES) *receiptList; STACK_OF(GENERAL_NAMES) *receiptList;
} d; } d;
}; };
# endif
struct CMS_Receipt_st { struct CMS_Receipt_st {
int32_t version; int32_t version;

3
include/openssl/cms.h
View file

@ -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(CMS_SignerInfo *si, ESS_SIGNING_CERT *sc);
int CMS_add1_signing_cert_v2(CMS_SignerInfo *si, ESS_SIGNING_CERT_V2 *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); int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen, CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
int allorfirst, int allorfirst,
@ -302,7 +300,6 @@ void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
int *pallorfirst, int *pallorfirst,
STACK_OF(GENERAL_NAMES) **plist, STACK_OF(GENERAL_NAMES) **plist,
STACK_OF(GENERAL_NAMES) **prto); STACK_OF(GENERAL_NAMES) **prto);
# endif
int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri, int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri,
X509_ALGOR **palg, X509_ALGOR **palg,
ASN1_OCTET_STRING **pukm); ASN1_OCTET_STRING **pukm);