2 files changed, 37 insertions, 20 deletions
diff --git a/lib/asn1/src/asn1rtt_ext.erl b/lib/asn1/src/asn1rtt_ext.erl
index 59dbcc16bd..7510b01f17 100644
--- a/lib/asn1/src/asn1rtt_ext.erl
+++ b/lib/asn1/src/asn1rtt_ext.erl
@@ -62,8 +62,11 @@ transform_to_EXTERNAL1994({'EXTERNAL',DRef,IndRef,Data_v_desc,Encoding}=V) ->
 		 {'EXTERNAL_identification_context-negotiation',IndRef,DRef}}
 	end,
     case Encoding of
-	{_,Val} when is_list(Val); is_binary(Val) ->
+	{'octet-aligned',Val} when is_list(Val); is_binary(Val) ->
+	    %% Transform to the EXTERNAL 1994 definition.
 	    {'EXTERNAL',Identification,Data_v_desc,Val};
 	_  ->
+	    %% Keep the EXTERNAL 1990 definition to avoid losing
+	    %% information.
 	    V
     end.
diff --git a/lib/asn1/test/testContextSwitchingTypes.erl b/lib/asn1/test/testContextSwitchingTypes.erl
index 4f67942922..f06cc7c117 100644
--- a/lib/asn1/test/testContextSwitchingTypes.erl
+++ b/lib/asn1/test/testContextSwitchingTypes.erl
@@ -52,22 +52,36 @@ test(Config) ->
 
 
 check_EXTERNAL({'EXTERNAL',Identif,DVD,DV})->
-    ?line ok=check_EXTERNAL_Idef(Identif),
-    ?line ok = check_EXTERNAL_DVD(DVD),
-    ?line ok = check_EXTERNAL_DV(DV).
-check_EXTERNAL_Idef({Alt,_}) when Alt=='context-negotiation';
-				  Alt=='presentation-context-id';
-				  Alt==syntax ->
-    ok;
-check_EXTERNAL_Idef(I) ->
-    {error,"failed on identification alternative",I}.
-check_EXTERNAL_DVD(DVD) when is_list(DVD) ->
-    ok;
-check_EXTERNAL_DVD(asn1_NOVALUE) ->
-    ok;
-check_EXTERNAL_DVD(DVD) ->
-    {error,"failed on data-value-descriptor alternative",DVD}.
-check_EXTERNAL_DV(DV) when is_list(DV);is_binary(DV) ->
-    ok;
-check_EXTERNAL_DV(DV) ->
-    {error,"failed on data-value alternative",DV}.
+    %% EXTERNAL in the 1994 format.
+    case Identif of
+	{'context-negotiation',_} ->
+	    ok;
+	{'presentation-context-id',Id} ->
+	    true = is_integer(Id);
+	{syntax,ObjId} ->
+	    check_object_identifier(ObjId)
+    end,
+    check_EXTERNAL_DVD(DVD),
+    check_EXTERNAL_DV(DV);
+check_EXTERNAL({'EXTERNAL',ObjId,IndirectRef,Descriptor,Enc})->
+    %% EXTERNAL in the 1990 format.
+    check_object_identifier(ObjId),
+    true = is_integer(IndirectRef),
+    true = is_binary(Descriptor) orelse is_list(Descriptor),
+    case Enc of
+	{arbitrary,_} -> ok;
+	{'single-ASN1-type',_} -> ok;
+	{'octet-aligned',_} -> ok
+    end.
+
+check_EXTERNAL_DVD(DVD) when is_list(DVD) -> ok;
+check_EXTERNAL_DVD(asn1_NOVALUE) -> ok.
+
+check_EXTERNAL_DV(DV) when is_list(DV); is_binary(DV) -> ok.
+
+check_object_identifier(Tuple) when is_tuple(Tuple) ->
+    %% An OBJECT IDENTIFIER is a tuple with integer elements.
+    case [E || E <- tuple_to_list(Tuple),
+	       not is_integer(E)] of
+	[] -> ok
+    end.