summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-01-14 08:14:48 +0000
committertb <>2022-01-14 08:14:48 +0000
commitb4428794e46977d3522eb9b836c6ad7ded3031ca (patch)
tree4969df5e0021408c17c26e6837b6b1fd711048f1 /src
parentc98675a805223ddb12c232cfb308c2ae2f0c1ceb (diff)
downloadopenbsd-b4428794e46977d3522eb9b836c6ad7ded3031ca.tar.gz
openbsd-b4428794e46977d3522eb9b836c6ad7ded3031ca.tar.bz2
openbsd-b4428794e46977d3522eb9b836c6ad7ded3031ca.zip
Remove NO_ASN1_FIELD_NAMES
This follows OpenSSL commit 26f2412d. ok inoguchi jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/asn1t.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/asn1/asn1t.h b/src/lib/libcrypto/asn1/asn1t.h
index 3fdfc7b46f..a4d0aaccbe 100644
--- a/src/lib/libcrypto/asn1/asn1t.h
+++ b/src/lib/libcrypto/asn1/asn1t.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1t.h,v 1.16 2021/11/30 18:32:55 tb Exp $ */ 1/* $OpenBSD: asn1t.h,v 1.17 2022/01/14 08:14:48 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -472,9 +472,7 @@ struct ASN1_TEMPLATE_st {
472 unsigned long flags; /* Various flags */ 472 unsigned long flags; /* Various flags */
473 long tag; /* tag, not used if no tagging */ 473 long tag; /* tag, not used if no tagging */
474 unsigned long offset; /* Offset of this field in structure */ 474 unsigned long offset; /* Offset of this field in structure */
475#ifndef NO_ASN1_FIELD_NAMES
476 const char *field_name; /* Field name */ 475 const char *field_name; /* Field name */
477#endif
478 ASN1_ITEM_EXP *item; /* Relevant ASN1_ITEM or ASN1_ADB */ 476 ASN1_ITEM_EXP *item; /* Relevant ASN1_ITEM or ASN1_ADB */
479}; 477};
480 478
@@ -600,9 +598,7 @@ struct ASN1_ITEM_st {
600 long tcount; /* Number of templates if SEQUENCE or CHOICE */ 598 long tcount; /* Number of templates if SEQUENCE or CHOICE */
601 const void *funcs; /* functions that handle this type */ 599 const void *funcs; /* functions that handle this type */
602 long size; /* Structure size (usually)*/ 600 long size; /* Structure size (usually)*/
603#ifndef NO_ASN1_FIELD_NAMES
604 const char *sname; /* Structure name */ 601 const char *sname; /* Structure name */
605#endif
606}; 602};
607 603
608/* These are values for the itype field and 604/* These are values for the itype field and