BER: Remove special case handling of certain string types

ObjectDescriptor, UTCTime, and GeneralizedTime are not special and
can be handled in the same way as all other restricted string types.

2 files changed, 6 insertions, 69 deletions

diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index c57bb6a335..a31074b4c1 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -168,6 +168,8 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
 	       'GeneralString'   -> restricted_string;
 	       'PrintableString' -> restricted_string;
 	       'IA5String'       -> restricted_string;
+	       'UTCTime'         -> restricted_string;
+	       'GeneralizedTime' -> restricted_string;
 	       Other             -> Other
 	   end,
     case Type of
@@ -204,10 +206,6 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) ->
 	    call(encode_UTF8_string, [Value,DoTag]);
 	'BMPString' ->
 	    call(encode_BMP_string, [Value,DoTag]);
-	'UTCTime' ->
-	    call(encode_utc_time, [Value,DoTag]);
-	'GeneralizedTime' ->
-	    call(encode_generalized_time, [Value,DoTag]);
 	'ASN1_OPEN_TYPE' ->
 	    call(encode_open_type, [Value,DoTag]);
 	#'ObjectClassFieldType'{} ->
@@ -474,6 +472,9 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Form,OptOrMand) ->
 		      'GeneralString'   -> restricted_string;
 		      'PrintableString' -> restricted_string;
 		      'IA5String'       -> restricted_string;
+		      'ObjectDescriptor'-> restricted_string;
+		      'UTCTime'         -> restricted_string;
+		      'GeneralizedTime' -> restricted_string;
 		      _                 -> Typename
 		  end,
     case NewTypeName of
@@ -519,10 +520,6 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Form,OptOrMand) ->
 	'RELATIVE-OID' ->
 	    emit(["decode_relative_oid(",BytesVar,","]),
 	    need(decode_relative_oid, 2);
-	'ObjectDescriptor' ->
-	    emit(["decode_restricted_string(",
-		  BytesVar,",",{asis,Constraint},","]),
-	    need(decode_restricted_string, 3);
 	restricted_string ->
 	    emit(["decode_restricted_string",AsBin,"(",BytesVar,","]),
 	    case Constraint of
@@ -544,14 +541,6 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Form,OptOrMand) ->
 	    emit(["decode_BMP_string",AsBin,"(",
 		  BytesVar,",",{asis,Constraint},","]),
 	    need(decode_BMP_string, 3);
-	'UTCTime' ->
-	    emit(["decode_utc_time",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},","]),
-	    need(decode_utc_time, 3);
-	'GeneralizedTime' ->
-	    emit(["decode_generalized_time",AsBin,"(",
-		  BytesVar,",",{asis,Constraint},","]),
-	    need(decode_generalized_time, 3);
 	'ASN1_OPEN_TYPE' ->
 	    emit(["decode_open_type_as_binary(",
 		  BytesVar,","]),
diff --git a/lib/asn1/src/asn1rtt_ber.erl b/lib/asn1/src/asn1rtt_ber.erl
index 499db701d9..b5429fe324 100644
--- a/lib/asn1/src/asn1rtt_ber.erl
+++ b/lib/asn1/src/asn1rtt_ber.erl
@@ -42,9 +42,7 @@
 	 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,
-	 encode_generalized_time/2,decode_generalized_time/3,
-	 encode_utc_time/2,decode_utc_time/3]).
+	 encode_BMP_string/2,decode_BMP_string/3]).
 
 -export([encode_open_type/2,decode_open_type/2,
 	 decode_open_type_as_binary/2]).
@@ -1376,56 +1374,6 @@ mk_BMP_string([0,B|T], US) ->
 mk_BMP_string([C,D|T], US) ->
     mk_BMP_string(T, [{0,0,C,D}|US]).
 
-
-%%============================================================================
-%% Generalized time, ITU_T X.680 Chapter 39
-%%
-%% encode Generalized time
-%%============================================================================
-
-encode_generalized_time(OctetList, TagIn) ->
-    encode_tags(TagIn, OctetList, length(OctetList)).
-
-%%============================================================================
-%% decode Generalized time
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
-%%============================================================================
-
-decode_generalized_time(Tlv, _Range, Tags) ->
-    Val = match_tags(Tlv, Tags),
-    NewVal = case Val of
-		 [_H|_T]=PartList ->		% constructed
-		     collect_parts(PartList);
-		 Bin ->
-		     Bin
-	     end,
-    binary_to_list(NewVal).
-
-%%============================================================================
-%% Universal time, ITU_T X.680 Chapter 40
-%%
-%% encode UTC time
-%%============================================================================
-
-encode_utc_time(OctetList, TagIn) ->
-    encode_tags(TagIn, OctetList, length(OctetList)).
-
-%%============================================================================
-%% decode UTC time
-%%    (Buffer, Range, HasTag, TotalLen) -> {String, Remain, RemovedBytes}
-%%============================================================================
-
-decode_utc_time(Tlv, _Range, Tags) ->
-    Val = match_tags(Tlv, Tags),
-    NewVal = case Val of
-		 [_|_]=PartList -> % constructed
-		     collect_parts(PartList);
-		 Bin ->
-		     Bin
-	     end,
-    binary_to_list(NewVal).
-
-
 %%============================================================================
 %% Length handling
 %%