From 2281bb413977f28868acf99a7f40ba2a795be7cf Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 25 Jul 2015 16:14:29 +0000
Subject: Expand ASN.1 template macros that got missed in the last pass - only
 change to generated assembly is due to line numbers.

---
 src/lib/libcrypto/x509v3/v3_pcons.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/x509v3/v3_pcons.c')

diff --git a/src/lib/libcrypto/x509v3/v3_pcons.c b/src/lib/libcrypto/x509v3/v3_pcons.c
index 7bece06271..03193427f7 100644
--- a/src/lib/libcrypto/x509v3/v3_pcons.c
+++ b/src/lib/libcrypto/x509v3/v3_pcons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_pcons.c,v 1.7 2015/07/25 16:00:14 jsing Exp $ */
+/* $OpenBSD: v3_pcons.c,v 1.8 2015/07/25 16:14:29 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -83,8 +83,13 @@ const X509V3_EXT_METHOD v3_policy_constraints = {
 };
 
 static const ASN1_TEMPLATE POLICY_CONSTRAINTS_seq_tt[] = {
-	ASN1_IMP_OPT(POLICY_CONSTRAINTS, requireExplicitPolicy,
-	    ASN1_INTEGER, 0),
+	{
+		.flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
+		.tag = 0,
+		.offset = offsetof(POLICY_CONSTRAINTS, requireExplicitPolicy),
+		.field_name = "requireExplicitPolicy",
+		.item = &ASN1_INTEGER_it,
+	},
 	{
 		.flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
 		.tag = 1,
-- 
cgit v1.2.3-55-g6feb