From dfc26ae8c18803d436fff4a2eee5ef6b4262a650 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Sat, 22 Jan 2022 03:47:51 -0600
Subject: [PATCH] asn1: Fix last remaining shift/reduce conflict

---
 lib/asn1/asn1parse.y | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/asn1/asn1parse.y b/lib/asn1/asn1parse.y
index 5491ea61c..16db10dbb 100644
--- a/lib/asn1/asn1parse.y
+++ b/lib/asn1/asn1parse.y
@@ -297,7 +297,6 @@ static unsigned long idcounter;
 %type <constraint_spec> ComponentRelationConstraint
 
 
-%expect 1
 %start ModuleDefinition
 
 %%
@@ -914,9 +913,20 @@ ParamGovernor   : DefinedObjectClass
 	     /* | Type */
 		;
 
-UnconstrainedType : BuiltinType | ReferencedType;
+UnconstrainedType : BitStringType
+                  | BooleanType
+                  | CharacterStringType
+                  | ChoiceType
+                  | EnumeratedType
+                  | IntegerType
+                  | NullType
+                  | ObjectIdentifierType
+                  | OctetStringType
+                  | SequenceType
+                  | SetType
+                  | ObjectClassFieldType; /* X.681 */
 
-Type		: UnconstrainedType | ConstrainedType ;
+Type		: BuiltinType | ReferencedType | ConstrainedType ;
 
 BuiltinType	: BitStringType
 		| BooleanType