summaryrefslogtreecommitdiffstats
path: root/crypto
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 15:48:53 +0200
commitdbd66443208cb0928b93bce04e32de412d452aff (patch)
tree4fddabcdefb0899012db26bfff6f8467bb57a4c9 /crypto
parentb23217a144d007a35875136ad744a5824a6a6306 (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/9364)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/cms/cms_lcl.h3
1 files changed, 0 insertions, 3 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;