提交 19b7b64c 编写于 作者: D Dr. Matthias St. Pierre

Remove OPENSSL_X509V3_H include detector from openssl/cms.h

The check is redundant, because <openssl/x509v3.h> is included.
Reviewed-by: NRichard Levitte <levitte@openssl.org>
Reviewed-by: NBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9365)
上级 ca066211
...@@ -317,8 +317,6 @@ struct CMS_OtherKeyAttribute_st { ...@@ -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 { ...@@ -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;
......
...@@ -284,8 +284,6 @@ int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si, ...@@ -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, void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
int lastpos, int type); int lastpos, int type);
# 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,
...@@ -298,7 +296,6 @@ void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr, ...@@ -298,7 +296,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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册