Normalize SIZE constraints to simplify backends

5 files changed, 24 insertions, 3 deletions

diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 8deabece37..0c5ba43a5f 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -655,7 +655,6 @@ constraint_equivalence(Config) ->
     AbsFile = filename:join(CaseDir, Asn1Spec++".abs"),
     {ok,Terms} = file:consult(AbsFile),
     Cs = [begin
-	      'INTEGER' = element(3, Type),	%Assertion.
 	      Constraints = element(4, Type),
 	      Name1 = atom_to_list(Name0),
 	      {Name,_} = lists:splitwith(fun(C) -> C =/= $X end, Name1),
diff --git a/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1 b/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1
index ad69553813..8b3d151502 100644
--- a/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1
@@ -43,6 +43,18 @@ BEGIN
  RangeX23 ::= INTEGER ((0..10) INTERSECTION (5..20) ^ (MIN..MAX))
  RangeX24 ::= INTEGER ((5|6|7|8|9|10) INTERSECTION (5..20) ^ (MIN..MAX))
 
+ UnconstrainedStringX00 ::= IA5String
+ UnconstrainedStringX01 ::= IA5String (SIZE (0..MAX))
+
+ ConstrainedStringX00 ::= IA5String (SIZE (0..5))
+ ConstrainedStringX01 ::= IA5String (SIZE (0|1|2|3|4|5))
+
+ -- Note: None of the back-ends care about the exact values
+ -- outside of the root range.
+ ExtConstrainedStringX00 ::= IA5String (SIZE (1..2, ...))
+ ExtConstrainedStringX01 ::= IA5String (SIZE (1|2, ..., 3))
+ ExtConstrainedStringX02 ::= IA5String (SIZE (1|2, ..., 3|4|5))
+
  integer4 INTEGER ::= 4
  integer11 INTEGER ::= 11
  integer42 INTEGER ::= 42
diff --git a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
index 99fe38c07c..64fa5f4cd4 100644
--- a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
@@ -55,10 +55,15 @@ BS1024 ::= BIT STRING (SIZE (1024))
   OsExpCon ::= [60] EXPLICIT OCTET STRING
   OsExpPri ::= [PRIVATE 61] EXPLICIT  OCTET STRING
   OsExpApp ::= [APPLICATION 62] EXPLICIT OCTET STRING
+
   OsFrag ::= OCTET STRING (SIZE (0..100000))
   FixedOs65536 ::= OCTET STRING (SIZE (65536))
   FixedOs65537 ::= OCTET STRING (SIZE (65537))
 
+  OsFragExt ::= OCTET STRING (SIZE (0..100000, ...))
+  FixedOs65536Ext ::= OCTET STRING (SIZE (65536, ...))
+  FixedOs65537Ext ::= OCTET STRING (SIZE (65537, ...))
+
   OsFixedStrings ::= SEQUENCE {
     b1 BOOLEAN,  -- Unalign
     s0 OCTET STRING (SIZE (0)),
diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl
index d245f6d1d5..fc217e45f7 100644
--- a/lib/asn1/test/testConstraints.erl
+++ b/lib/asn1/test/testConstraints.erl
@@ -142,6 +142,9 @@ int_constraints(Rules) ->
     roundtrip('FixedSize2', "0123456789"),
     roundtrip('FixedSize2', "0123456789abcdefghij"),
 
+    range_error(Rules, 'FixedSize', "short"),
+    range_error(Rules, 'FixedSize2', "short"),
+
     [roundtrip('VariableSize', lists:seq($A, $A+L-1)) ||
 	L <- lists:seq(1, 10)],
 
@@ -181,7 +184,7 @@ range_error(ber, Type, Value) ->
     %% BER: Values outside the effective range should be rejected
     %% on decode.
     {ok,Encoded} = 'Constraints':encode(Type, Value),
-    {error,{asn1,{integer_range,_,_}}} = 'Constraints':decode(Type, Encoded),
+    {error,{asn1,_}} = 'Constraints':decode(Type, Encoded),
     ok;
 range_error(Per, Type, Value) when Per =:= per; Per =:= uper ->
     %% (U)PER: Values outside the effective range should be rejected
diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl
index 66415afe87..6f5a7f2437 100644
--- a/lib/asn1/test/testPrimStrings.erl
+++ b/lib/asn1/test/testPrimStrings.erl
@@ -276,10 +276,12 @@ fragmented_octet_string(Erules) ->
 	    K48-1,K48,K48+1,K48+(1 bsl 7)-1,K48+(1 bsl 7),K48+(1 bsl 7)+1,
 	    K64-1,K64,K64+1,K64+(1 bsl 7)-1,K64+(1 bsl 7),K64+(1 bsl 7)+1,
 	    K64+K16-1,K64+K16,K64+K16+1],
-    Types = ['Os','OsFrag'],
+    Types = ['Os','OsFrag','OsFragExt'],
     [fragmented_octet_string(Erules, Types, L) || L <- Lens],
     fragmented_octet_string(Erules, ['FixedOs65536'], 65536),
     fragmented_octet_string(Erules, ['FixedOs65537'], 65537),
+    fragmented_octet_string(Erules, ['FixedOs65536Ext'], 65536),
+    fragmented_octet_string(Erules, ['FixedOs65537Ext'], 65537),
 
     %% Make sure that octet alignment works.
     roundtrip('OsAlignment',