2 files changed, 101 insertions, 4 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
index cfaf4cf034..99fe38c07c 100644
--- a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
@@ -72,6 +72,32 @@ BS1024 ::= BIT STRING (SIZE (1024))
     i INTEGER (0..1024)
   }
 
+  OsFixedStringsExt ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 OCTET STRING (SIZE (0, ...)),
+    s1 OCTET STRING (SIZE (1, ...)),
+    s2 OCTET STRING (SIZE (2, ...)),
+    s3 OCTET STRING (SIZE (3, ...)),
+    b2 BOOLEAN,  -- Unalign
+    s255 OCTET STRING (SIZE (255, ...)),
+    s256 OCTET STRING (SIZE (256, ...)),
+    s257 OCTET STRING (SIZE (257, ...)),
+    i INTEGER (0..1024)
+  }
+
+  OsVarStringsExt ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 OCTET STRING (SIZE (0, ...)),
+    s1 OCTET STRING (SIZE (0..1, ...)),
+    s2 OCTET STRING (SIZE (1..2, ...)),
+    s3 OCTET STRING (SIZE (2..3, ...)),
+    b2 BOOLEAN,  -- Unalign
+    s255 OCTET STRING (SIZE (254..255, ...)),
+    s256 OCTET STRING (SIZE (255..256, ...)),
+    s257 OCTET STRING (SIZE (256..257, ...)),
+    i INTEGER (0..1024)
+  }
+
   OsAlignment ::= SEQUENCE {
     b1 BOOLEAN,
     s1 Os,
@@ -82,6 +108,52 @@ BS1024 ::= BIT STRING (SIZE (1024))
     i INTEGER (0..63)
   }
 
+  IA5FixedStrings ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 IA5String (SIZE (0)),
+    s1 IA5String (SIZE (1)),
+    s2 IA5String (SIZE (2)),
+    s3 IA5String (SIZE (3)),
+    b2 BOOLEAN,  -- Unalign
+    s4 IA5String (SIZE (4)),
+    b3 BOOLEAN,  -- Unalign
+    s255 IA5String (SIZE (255)),
+    s256 IA5String (SIZE (256)),
+    s257 IA5String (SIZE (257)),
+    i INTEGER (0..1024)
+  }
+
+  IA5FixedStringsExt ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 IA5String (SIZE (0, ...)),
+    s1 IA5String (SIZE (1, ...)),
+    s2 IA5String (SIZE (2, ...)),
+    s3 IA5String (SIZE (3, ...)),
+    b2 BOOLEAN,  -- Unalign
+    s4 IA5String (SIZE (4, ...)),
+    b3 BOOLEAN,  -- Unalign
+    s255 IA5String (SIZE (255, ...)),
+    s256 IA5String (SIZE (256, ...)),
+    s257 IA5String (SIZE (257, ...)),
+    i INTEGER (0..1024)
+  }
+
+  IA5VarStringsExt ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 IA5String (SIZE (0, ...)),
+    s1 IA5String (SIZE (0..1, ...)),
+    s2 IA5String (SIZE (1..2, ...)),
+    s3 IA5String (SIZE (2..3, ...)),
+    b2 BOOLEAN,  -- Unalign
+    s4 IA5String (SIZE (3..4, ...)),
+    b3 BOOLEAN,  -- Unalign
+    s255 IA5String (SIZE (254..255, ...)),
+    s256 IA5String (SIZE (255..256, ...)),
+    s257 IA5String (SIZE (256..257, ...)),
+    i INTEGER (0..1024)
+  }
+
+
   Ns ::= NumericString
   NsCon ::= [70] NumericString
   NsExpCon ::= [71] EXPLICIT NumericString
diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl
index f8b0c5b05a..66415afe87 100644
--- a/lib/asn1/test/testPrimStrings.erl
+++ b/lib/asn1/test/testPrimStrings.erl
@@ -255,11 +255,16 @@ octet_string(Rules) ->
     fragmented_octet_string(Rules),
 
     S255 = lists:seq(1, 255),
-    FixedStrings = {'OsFixedStrings',true,"","1","12","345",true,
-		    S255,[$a|S255],[$a,$b|S255],397},
-    roundtrip('OsFixedStrings', FixedStrings),
+    Strings = {type,true,"","1","12","345",true,
+	       S255,[$a|S255],[$a,$b|S255],397},
+    p_roundtrip('OsFixedStrings', Strings),
+    p_roundtrip('OsFixedStringsExt', Strings),
+    p_roundtrip('OsVarStringsExt', Strings),
+    ShortenedStrings = shorten_by_two(Strings),
+    p_roundtrip('OsFixedStringsExt', ShortenedStrings),
+    p_roundtrip('OsVarStringsExt', ShortenedStrings),
     ok.
-    
+
 fragmented_octet_string(Erules) ->
     K16 = 1 bsl 14,
     K32 = K16 + K16,
@@ -438,6 +443,15 @@ other_strings(_Rules) ->
 
     roundtrip('IA5Visible', lists:seq($\s, $~)),
 
+    S255 = lists:seq(0, 127) ++ lists:seq(1, 127),
+    Strings = {type,true,"","1","12","345",true,"6789",true,
+	       S255,[$a|S255],[$a,$b|S255],397},
+    p_roundtrip('IA5FixedStrings', Strings),
+    p_roundtrip('IA5FixedStringsExt', Strings),
+    p_roundtrip('IA5VarStringsExt', Strings),
+    ShortenedStrings = shorten_by_two(Strings),
+    p_roundtrip('IA5VarStringsExt', ShortenedStrings),
+
     ok.
 
 
@@ -709,6 +723,17 @@ wrapper_utf8_binary_to_list(L) when is_list(L) ->
 wrapper_utf8_binary_to_list(B) ->
     asn1rt:utf8_binary_to_list(B).
 
+shorten_by_two(Tuple) ->
+    L = [case E of
+	     [_,_|T] -> T;
+	     _ -> E
+	 end || E <- tuple_to_list(Tuple)],
+    list_to_tuple(L).
+
+p_roundtrip(Type, Value0) ->
+    Value = setelement(1, Value0, Type),
+    roundtrip(Type, Value).
+
 roundtrip(Type, Value) ->
     {ok,Encoded} = 'PrimStrings':encode(Type, Value),
     {ok,Value} = 'PrimStrings':decode(Type, Encoded),