From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 6 Apr 2016 17:57:48 +0000 (+0100)
Subject: always use field names
X-Git-Tag: OpenSSL_1_1_0-pre5~112
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=26f2412d9beb1bfc88d0647b7b485aa526744fa8;p=oweals%2Fopenssl.git

always use field names

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index 455efffbab..b680dea6dc 100644
--- a/include/openssl/asn1t.h
+++ b/include/openssl/asn1t.h
@@ -512,9 +512,7 @@ struct ASN1_TEMPLATE_st {
     unsigned long flags;        /* Various flags */
     long tag;                   /* tag, not used if no tagging */
     unsigned long offset;       /* Offset of this field in structure */
-# ifndef NO_ASN1_FIELD_NAMES
     const char *field_name;     /* Field name */
-# endif
     ASN1_ITEM_EXP *item;        /* Relevant ASN1_ITEM or ASN1_ADB */
 };
 
@@ -631,9 +629,7 @@ struct ASN1_ITEM_st {
     long tcount;                /* Number of templates if SEQUENCE or CHOICE */
     const void *funcs;          /* functions that handle this type */
     long size;                  /* Structure size (usually) */
-# ifndef NO_ASN1_FIELD_NAMES
     const char *sname;          /* Structure name */
-# endif
 };
 
 /*-