Commit 19b7b64c authored by Dr. Matthias St. Pierre's avatar Dr. Matthias St. Pierre
Browse files

Remove OPENSSL_X509V3_H include detector from openssl/cms.h 



The check is redundant, because <openssl/x509v3.h> is included.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9365)
parent ca066211

crypto/cms/cms_lcl.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

include/openssl/cms.h

+0 −3
Original line number Diff line number Diff line
@@ -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);