Normalize SIZE constraints to simplify backends

1 files changed, 50 insertions, 76 deletions

diff --git a/lib/asn1/src/asn1rtt_uper.erl b/lib/asn1/src/asn1rtt_uper.erl
index 0a543ea6d7..8cf23a9239 100644
--- a/lib/asn1/src/asn1rtt_uper.erl
+++ b/lib/asn1/src/asn1rtt_uper.erl
@@ -34,17 +34,17 @@
 
  -export([encode_open_type/1]).
 
- -export([encode_UniversalString/2,
-	 encode_PrintableString/2,
+ -export([encode_UniversalString/3,
+	 encode_PrintableString/3,
 	 encode_GeneralString/2,
 	 encode_GraphicString/2,
 	 encode_TeletexString/2,
 	 encode_VideotexString/2,
-	 encode_VisibleString/2,
+	 encode_VisibleString/3,
 	 encode_UTF8String/1,
-	 encode_BMPString/2,
-	 encode_IA5String/2,
-	 encode_NumericString/2,
+	 encode_BMPString/3,
+	 encode_IA5String/3,
+	 encode_NumericString/3,
 	 encode_ObjectDescriptor/2
 	]).
 
@@ -346,22 +346,18 @@ encode_length(Len) -> % un-constrained
 	    error({error,{asn1,{encode_length,{nyi,above_16k}}}})
     end.
 
-encode_length(undefined, Len) ->		% unconstrained
-    encode_length(Len);
-encode_length({0,'MAX'},Len) ->
-    encode_length(undefined, Len);
-encode_length({Lb,Ub}=Vr, Len) when Ub =< 65535, Lb >= 0 -> % constrained
-    encode_constrained_number(Vr,Len);
-encode_length({Lb,_Ub}, Len) when is_integer(Lb), Lb >= 0 -> % Ub > 65535
-    encode_length(Len);
-encode_length({{Lb,Ub}=Vr,Ext},Len)
-  when Ub =< 65535, Lb =< Len, Len =< Ub, is_list(Ext) ->
-    %% constrained extensible
-    [<<0:1>>,encode_constrained_number(Vr,Len)];
-encode_length({{_Lb,_Ub},Ext}, Len) when is_list(Ext) ->
-    [<<1:1>>,encode_length(Len)];
-encode_length(SingleValue, _Len) when is_integer(SingleValue) ->
-    [].
+encode_length({C,[]}, Len) ->
+    case C of
+	{Lb,Ub}=Vr when Lb =< Len, Len =< Ub ->
+	    [<<0:1>>|encode_constrained_number(Vr, Len)];
+	_ ->
+	    [<<1:1>>|encode_length(Len)]
+    end;
+encode_length(Len, Len) ->
+    [];
+encode_length(Vr, Len) ->
+    encode_constrained_number(Vr, Len).
+
 
 %% X.691 10.9.3.4 (only used for length of bitmap that prefixes extension
 %% additions in a sequence or set
@@ -643,10 +639,6 @@ encode_octet_string(Val) ->
 
 encode_octet_string(C, Val) ->
     case C of
-	1 ->
-	    list_to_binary(Val);
-	2 ->
-	    list_to_binary(Val);
 	{_,_}=VR  ->
 	    try
 		[encode_length(VR, length(Val)),list_to_binary(Val)]
@@ -655,20 +647,7 @@ encode_octet_string(C, Val) ->
 		    encode_fragmented_octet_string(Val)
 	    end;
 	Sv when is_integer(Sv), Sv =:= length(Val) -> % fixed length
-	    if
-		Sv =< 65535 ->
-		    list_to_binary(Val);
-		true ->
-		    encode_fragmented_octet_string(Val)
-	    end;
-	Sv when is_list(Sv) ->
-	    try
-		[encode_length({hd(Sv),lists:max(Sv)},
-			       length(Val)),list_to_binary(Val)]
-	    catch
-		error:{error,{asn1,{encode_length,_}}} ->
-		    encode_fragmented_octet_string(Val)
-	    end
+	    list_to_binary(Val)
     end.
 
 
@@ -698,41 +677,34 @@ efos_1(<<B/bitstring>>) ->
 encode_restricted_string(Val) when is_list(Val)->
     [encode_length(length(Val)),list_to_binary(Val)].
 
-encode_known_multiplier_string(StringType, C, Val) ->
-    Result = chars_encode(C, StringType, Val),
-    NumBits = get_NumBits(C, StringType),
-    case get_constraint(C, 'SizeConstraint') of
-	Ub when is_integer(Ub), Ub*NumBits =< 16  ->
-	    Result;
-	0 ->
-	    [];
-	Ub when is_integer(Ub),Ub =<65535 -> % fixed length
+encode_known_multiplier_string(StringType, C, Pa, Val) ->
+    Result = chars_encode(Pa, StringType, Val),
+    case C of
+	Ub when is_integer(Ub) ->
 	    Result;
-	{Ub,Lb} ->
-	    [encode_length({Ub,Lb}, length(Val)),Result];
-	Vl when is_list(Vl) ->
-	    [encode_length({lists:min(Vl),lists:max(Vl)}, length(Val)),Result];
+	{_,_}=Range ->
+	    [encode_length(Range, length(Val)),Result];
 	no  ->
 	    [encode_length(length(Val)),Result]
     end.
 
-encode_NumericString(C,Val) ->
-    encode_known_multiplier_string('NumericString',C,Val).
+encode_NumericString(C, Pa, Val) ->
+    encode_known_multiplier_string('NumericString', C, Pa, Val).
 
-encode_PrintableString(C,Val) ->
-    encode_known_multiplier_string('PrintableString',C,Val).
+encode_PrintableString(C, Pa, Val) ->
+    encode_known_multiplier_string('PrintableString', C, Pa, Val).
 
-encode_VisibleString(C,Val) -> % equivalent with ISO646String
-    encode_known_multiplier_string('VisibleString',C,Val).
+encode_VisibleString(C, Pa, Val) -> % equivalent with ISO646String
+    encode_known_multiplier_string('VisibleString', C, Pa, Val).
 
-encode_IA5String(C,Val) ->
-    encode_known_multiplier_string('IA5String',C,Val).
+encode_IA5String(C, Pa, Val) ->
+    encode_known_multiplier_string('IA5String', C, Pa, Val).
 
-encode_BMPString(C,Val) ->
-    encode_known_multiplier_string('BMPString',C,Val).
+encode_BMPString(C, Pa, Val) ->
+    encode_known_multiplier_string('BMPString', C, Pa, Val).
 
-encode_UniversalString(C,Val) ->
-    encode_known_multiplier_string('UniversalString',C,Val).
+encode_UniversalString(C, Pa, Val) ->
+    encode_known_multiplier_string('UniversalString', C, Pa, Val).
 
 
 %% end of known-multiplier strings for which PER visible constraints are
@@ -761,14 +733,15 @@ encode_VideotexString(_C,Val) ->
 %% into account.
 %% This function does only encode the value part and NOT the length
 
-chars_encode(C,StringType,Value) ->
-    case {StringType,get_constraint(C,'PermittedAlphabet')} of
+chars_encode(Pa, StringType, Value) ->
+    case {StringType,Pa} of
 	{'UniversalString',{_,_Sv}} ->
 	    exit({error,{asn1,{'not implemented',"UniversalString with PermittedAlphabet constraint"}}});
 	{'BMPString',{_,_Sv}} ->
 	    exit({error,{asn1,{'not implemented',"BMPString with PermittedAlphabet constraint"}}});
 	_ ->
-	    {NumBits,CharOutTab} = {get_NumBits(C,StringType),get_CharOutTab(C,StringType)},
+	    {NumBits,CharOutTab} = {get_NumBits(Pa, StringType),
+				    get_CharOutTab(Pa, StringType)},
 	    chars_encode2(Value,NumBits,CharOutTab)
     end.
 
@@ -795,8 +768,8 @@ exit_if_false(V,false)->
 exit_if_false(_,V) ->V.
 
 
-get_NumBits(C,StringType) ->
-    case get_constraint(C,'PermittedAlphabet') of
+get_NumBits(Pa, StringType) ->
+    case Pa of
 	{'SingleValue',Sv} ->
 	    charbits(length(Sv));
 	no ->
@@ -816,22 +789,23 @@ get_NumBits(C,StringType) ->
 	    end
     end.
 
-get_CharOutTab(C,StringType) ->
-    case get_constraint(C,'PermittedAlphabet') of
+get_CharOutTab(Pa, StringType) ->
+    case Pa of
 	{'SingleValue',Sv} ->
-	    get_CharTab2(C,StringType,hd(Sv),lists:max(Sv),Sv);
+	    get_CharTab2(Pa, StringType, hd(Sv), lists:max(Sv), Sv);
 	no ->
 	    case StringType of
 		'IA5String' ->
 		    {0,16#7F,notab};
 		'VisibleString' ->
-		    get_CharTab2(C,StringType,16#20,16#7F,notab);
+		    get_CharTab2(Pa, StringType, 16#20, 16#7F, notab);
 		'PrintableString' ->
 		    Chars = lists:sort(
 			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-		    get_CharTab2(C,StringType,hd(Chars),lists:max(Chars),Chars);
+		    get_CharTab2(Pa, StringType, hd(Chars),
+				 lists:max(Chars), Chars);
 		'NumericString' ->
-		    get_CharTab2(C,StringType,16#20,$9," 0123456789");
+		    get_CharTab2(Pa, StringType, 16#20, $9, " 0123456789");
 		'UniversalString' ->
 		    {0,16#FFFFFFFF,notab};
 		'BMPString' ->