PER, UPER: Fix record name mismatch between HRL file and decoding code

When a SEQUENCE was defined inline inside extension addition group
like this:

InlinedSeq ::= SEQUENCE {
     ...,
     [[
        s SEQUENCE {
	   a INTEGER,
	   b BOOLEAN
        }
     ]]
}

the decoding code would return the contents of the SEQUENCE in a
record named 'InlinedSeq_ExtAddGroup1_s', while the record definition
in the generated HRL file would be 'InlinedSeq_s'.

Since there is no reason to use the longer record name (no risk for
ambiguity), correct the name in the decoding code.

2 files changed, 22 insertions, 0 deletions

diff --git a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
index b07dcd8baa..0e905d8839 100644
--- a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
+++ b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
@@ -118,4 +118,23 @@ AC-BarringConfig ::= SEQUENCE {
   ac-BarringForSpecialAC BIT STRING (SIZE(5))
 }
 
+InlinedSeq ::= SEQUENCE {
+     ...,
+     [[
+        s SEQUENCE {
+	   a INTEGER,
+	   b BOOLEAN
+        }
+     ]]
+}
+
+-- 'ExtAddGroup1' is used internally to represent fake sequences for
+-- extension addition groups. Make sure that a real sequence with that
+-- name at the top-level doesn't cause a problem.
+
+ExtAddGroup1 ::= SEQUENCE {
+    x INTEGER,
+    y INTEGER
+}
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
index 00e4c707dd..8e21e6ca84 100644
--- a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -34,6 +34,9 @@ run(Erule) ->
     run3(),
     run3(Erule),
 
+    roundtrip('InlinedSeq', #'InlinedSeq'{s=#'InlinedSeq_s'{a=42,b=true}}),
+    roundtrip('ExtAddGroup1', #'ExtAddGroup1'{x=42,y=1023}),
+
     ok.
 
 %% From X.691 (07/2002) A.4.