Test ENUMERATED with many extended values

2 files changed, 43 insertions, 3 deletions

diff --git a/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1 b/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
index 3a727e46bb..8dc5f3d7e1 100644
--- a/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
@@ -31,5 +31,25 @@ Seq ::= SEQUENCE {
    i INTEGER
 }
 
+EnumExtBig ::= ENUMERATED {
+  base,
+  ...,
+  e00,e01,e02,e03,e04,e05,e06,e07,e08,e09,e0a,e0b,e0c,e0d,e0e,e0f,
+  e10,e11,e12,e13,e14,e15,e16,e17,e18,e19,e1a,e1b,e1c,e1d,e1e,e1f,
+  e20,e21,e22,e23,e24,e25,e26,e27,e28,e29,e2a,e2b,e2c,e2d,e2e,e2f,
+  e30,e31,e32,e33,e34,e35,e36,e37,e38,e39,e3a,e3b,e3c,e3d,e3e,e3f,
+  e40,e41,e42,e43,e44,e45,e46,e47,e48,e49,e4a,e4b,e4c,e4d,e4e,e4f,
+  e50,e51,e52,e53,e54,e55,e56,e57,e58,e59,e5a,e5b,e5c,e5d,e5e,e5f,
+  e60,e61,e62,e63,e64,e65,e66,e67,e68,e69,e6a,e6b,e6c,e6d,e6e,e6f,
+  e70,e71,e72,e73,e74,e75,e76,e77,e78,e79,e7a,e7b,e7c,e7d,e7e,e7f,
+  e80
+}
+
+SeqBig ::= SEQUENCE {
+  b BOOLEAN,
+  e EnumExtBig,
+  i INTEGER
+}
+
 END
 
diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl
index 8840ed6d2f..8779f3b83b 100644
--- a/lib/asn1/test/testEnumExt.erl
+++ b/lib/asn1/test/testEnumExt.erl
@@ -38,7 +38,7 @@ main(Rule) when Rule =:= per; Rule =:= uper ->
     %% ENUMERATED no extensionmark 
     B64 = <<64>>,
     B64 = roundtrip('Noext', red),
-    common();
+    common(Rule);
 main(ber) ->
     io:format("main(ber)~n",[]),
     %% ENUMERATED with extensionmark (value is in root set)
@@ -56,18 +56,38 @@ main(ber) ->
     roundtrip('Globalstate', preop),
     roundtrip('Globalstate', com),
 
-    common().
+    common(ber).
 
-common() ->
+common(Erule) ->
     roundtrip('Seq', {'Seq',blue,42}),
     roundtrip('Seq', {'Seq',red,42}),
     roundtrip('Seq', {'Seq',green,42}),
     roundtrip('Seq', {'Seq',orange,47}),
     roundtrip('Seq', {'Seq',black,4711}),
     roundtrip('Seq', {'Seq',magenta,4712}),
+
+    [begin
+	 S = io_lib:format("e~2.016.0b", [I]),
+	 E = list_to_atom(lists:flatten(S)),
+	 roundtrip('SeqBig', {'SeqBig',true,E,9357})
+     end || I <- lists:seq(0, 128)],
+
+    v_roundtrip(Erule, 'SeqBig', {'SeqBig',true,e40,9357}),
+    v_roundtrip(Erule, 'SeqBig', {'SeqBig',true,e80,9357}),
     ok.
 
 roundtrip(Type, Value) ->
     {ok,Encoded} = 'EnumExt':encode(Type, Value),
     {ok,Value} = 'EnumExt':decode(Type, Encoded),
     Encoded.
+
+v_roundtrip(Erule, Type, Value) ->
+    Encoded = roundtrip(Type, Value),
+    Encoded = asn1_test_lib:hex_to_bin(v(Erule, Value)).
+
+v(ber, {'SeqBig',true,e40,9357}) -> "300A8001 FF810141 8202248D";
+v(ber, {'SeqBig',true,e80,9357}) -> "300B8001 FF810200 81820224 8D";
+v(per, {'SeqBig',true,e40,9357}) -> "E0014002 248D";
+v(per, {'SeqBig',true,e80,9357}) -> "E0018002 248D";
+v(uper, {'SeqBig',true,e40,9357}) -> "E0280044 91A0";
+v(uper, {'SeqBig',true,e80,9357}) -> "E0300044 91A0".