From: job <job@openbsd.org>
Date: Thu, 2 Sep 2021 21:04:01 +0000 (+0000)
Subject: Unroll ASN1_EX_TEMPLATE_TYPE IPAddrBlocks
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e42fe416823407812934f912df3b055a48f8fe0c;p=openbsd

Unroll ASN1_EX_TEMPLATE_TYPE IPAddrBlocks

OK tb@
---

diff --git a/lib/libcrypto/x509/x509_addr.c b/lib/libcrypto/x509/x509_addr.c
index 7a2e152c873..7a35b21332b 100644
--- a/lib/libcrypto/x509/x509_addr.c
+++ b/lib/libcrypto/x509/x509_addr.c
@@ -138,10 +138,13 @@ const ASN1_ITEM IPAddressFamily_it = {
 	.sname = "IPAddressFamily",
 };
 
-static const ASN1_TEMPLATE IPAddrBlocks_item_tt =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, IPAddrBlocks,
-    IPAddressFamily)
-static_ASN1_ITEM_TEMPLATE_END(IPAddrBlocks)
+static const ASN1_TEMPLATE IPAddrBlocks_item_tt = {
+	.flags = ASN1_TFLG_SEQUENCE_OF,
+	.tag = 0,
+	.offset = 0,
+	.field_name = "IPAddrBlocks",
+	.item = &IPAddressFamily_it,
+};
 
 IPAddressRange *
 d2i_IPAddressRange(IPAddressRange **a, const unsigned char **in, long len)