aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/asn1/src/asn1ct_gen_ber_bin_v2.erl74
-rw-r--r--lib/asn1/src/asn1rtt_ber.erl49
2 files changed, 36 insertions, 87 deletions
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index e7414a2040..fe5b5031b6 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -495,10 +495,19 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Form,OptOrMand) ->
_ -> ""
end,
NewTypeName = case Typename of
- 'ANY' -> 'ASN1_OPEN_TYPE';
- _ -> Typename
+ 'ANY' -> 'ASN1_OPEN_TYPE';
+ 'OCTET STRING' -> restricted_string;
+ 'NumericString' -> restricted_string;
+ 'TeletexString' -> restricted_string;
+ 'T61String' -> restricted_string;
+ 'VideotexString' -> restricted_string;
+ 'GraphicString' -> restricted_string;
+ 'VisibleString' -> restricted_string;
+ 'GeneralString' -> restricted_string;
+ 'PrintableString' -> restricted_string;
+ 'IA5String' -> restricted_string;
+ _ -> Typename
end,
-% DoLength =
case NewTypeName of
'BOOLEAN'->
emit(["decode_boolean(",BytesVar,","]),
@@ -531,54 +540,17 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Form,OptOrMand) ->
need(decode_relative_oid, 2);
'ObjectDescriptor' ->
emit(["decode_restricted_string(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_ObjectDescriptor},","]),
- need(decode_restricted_string, 4);
- 'OCTET STRING' ->
- emit(["decode_octet_string",AsBin,"(",BytesVar,",",
- {asis,Constraint},","]),
- need(decode_octet_string, 3);
- 'NumericString' ->
- emit(["decode_restricted_string",AsBin,"(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_NumericString},","]),
- need(decode_restricted_string, 4);
- TString when TString == 'TeletexString';
- TString == 'T61String' ->
- emit(["decode_restricted_string",AsBin,"(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_TeletexString},","]),
- need(decode_restricted_string, 4);
- 'VideotexString' ->
- emit(["decode_restricted_string",AsBin,"(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_VideotexString},","]),
- need(decode_restricted_string, 4);
- 'GraphicString' ->
- emit(["decode_restricted_string",AsBin,"(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_GraphicString},","]),
- need(decode_restricted_string, 4);
- 'VisibleString' ->
- emit(["decode_restricted_string",AsBin,"(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_VisibleString},","]),
- need(decode_restricted_string, 4);
- 'GeneralString' ->
- emit(["decode_restricted_string",AsBin,"(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_GeneralString},","]),
- need(decode_restricted_string, 4);
- 'PrintableString' ->
- emit(["decode_restricted_string",AsBin,"(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_PrintableString},","]),
- need(decode_restricted_string, 4);
- 'IA5String' ->
- emit(["decode_restricted_string",AsBin,"(",
- BytesVar,",",{asis,Constraint},",",
- {asis,?T_IA5String},","]),
- need(decode_restricted_string, 4);
+ BytesVar,",",{asis,Constraint},","]),
+ need(decode_restricted_string, 3);
+ restricted_string ->
+ emit(["decode_restricted_string",AsBin,"(",BytesVar,","]),
+ case Constraint of
+ [] ->
+ need(decode_restricted_string, 2);
+ _ ->
+ emit([{asis,Constraint},","]),
+ need(decode_restricted_string, 3)
+ end;
'UniversalString' ->
emit(["decode_universal_string",AsBin,"(",
BytesVar,",",{asis,Constraint},","]),
diff --git a/lib/asn1/src/asn1rtt_ber.erl b/lib/asn1/src/asn1rtt_ber.erl
index e086612818..3c6ab3e1c4 100644
--- a/lib/asn1/src/asn1rtt_ber.erl
+++ b/lib/asn1/src/asn1rtt_ber.erl
@@ -33,11 +33,11 @@
decode_named_bit_string/3,
decode_compact_bit_string/3,
decode_legacy_bit_string/3,
- decode_octet_string/3,
encode_null/2,decode_null/2,
encode_relative_oid/2,decode_relative_oid/2,
encode_object_identifier/2,decode_object_identifier/2,
- encode_restricted_string/2,decode_restricted_string/4,
+ encode_restricted_string/2,
+ decode_restricted_string/2,decode_restricted_string/3,
encode_universal_string/2,decode_universal_string/3,
encode_UTF8_string/2,decode_UTF8_string/2,
encode_BMP_string/2,decode_BMP_string/3,
@@ -1107,15 +1107,6 @@ decode_bitstring_NNL([0|BitList],NamedNumberList,No,Result) ->
decode_bitstring_NNL(BitList,NamedNumberList,No+1,Result).
%%============================================================================
-%% decode octet string
-%% (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
-%%
-%% Octet string is decoded as a restricted string
-%%============================================================================
-decode_octet_string(Buffer, Range, Tags) ->
- decode_restricted_string(Buffer, Range, ?N_OCTET_STRING, Tags).
-
-%%============================================================================
%% Null value, ITU_T X.690 Chapter 8.8
%%
%% encode NULL value
@@ -1252,33 +1243,16 @@ encode_restricted_string(OctetList, TagIn) when is_list(OctetList) ->
%% decode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings
%%============================================================================
-decode_restricted_string(Tlv, Range, StringType, TagsIn) ->
+decode_restricted_string(Tlv, TagsIn) ->
Bin = match_and_collect(Tlv, TagsIn),
- Val = decode_restricted(Bin, StringType),
- check_and_convert_restricted_string(Val, Range).
-
-decode_restricted(Bin, StringType) ->
- case StringType of
- ?N_UniversalString ->
- mk_universal_string(binary_to_list(Bin));
- ?N_BMPString ->
- mk_BMP_string(binary_to_list(Bin));
- _ ->
- Bin
- end.
+ binary_to_list(Bin).
-check_and_convert_restricted_string(Val0, Range) ->
- {Len,Val} = if is_binary(Val0) ->
- {byte_size(Val0),binary_to_list(Val0)};
- is_list(Val0) ->
- {length(Val0),Val0}
- end,
- check_restricted_string(Val, Len, Range).
+decode_restricted_string(Tlv, Range, TagsIn) ->
+ Bin = match_and_collect(Tlv, TagsIn),
+ check_restricted_string(binary_to_list(Bin), byte_size(Bin), Range).
check_restricted_string(Val, StrLen, Range) ->
case Range of
- [] -> % No length constraint
- Val;
{Lb,Ub} when StrLen >= Lb, Ub >= StrLen -> % variable length constraint
Val;
{{Lb,_Ub},[]} when StrLen >= Lb ->
@@ -1324,8 +1298,9 @@ mk_uni_list([H|T],List) ->
%%===========================================================================
decode_universal_string(Buffer, Range, Tags) ->
- decode_restricted_string(Buffer, Range, ?N_UniversalString, Tags).
-
+ Bin = match_and_collect(Buffer, Tags),
+ Val = mk_universal_string(binary_to_list(Bin)),
+ check_restricted_string(Val, length(Val), Range).
mk_universal_string(In) ->
mk_universal_string(In, []).
@@ -1386,7 +1361,9 @@ mk_BMP_list([H|T], List) ->
%% {String, Remain, RemovedBytes}
%%============================================================================
decode_BMP_string(Buffer, Range, Tags) ->
- decode_restricted_string(Buffer, Range, ?N_BMPString, Tags).
+ Bin = match_and_collect(Buffer, Tags),
+ Val = mk_BMP_string(binary_to_list(Bin)),
+ check_restricted_string(Val, length(Val), Range).
mk_BMP_string(In) ->
mk_BMP_string(In,[]).
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 23:41:44 +0000