3 files changed, 82 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 76a74aa477..5d8740b92e 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -947,6 +947,8 @@ prepare_objset(ObjDef={object,definedsyntax,_ObjFields}) ->
     {set,[ObjDef],false};
 prepare_objset({ObjDef=#type{},Ext}) when is_list(Ext) ->
     {set,[ObjDef|Ext],true};
+prepare_objset({#type{}=Type,#type{}=Ext}) ->
+    {set,[Type,Ext],true};
 prepare_objset(Ret) ->
     Ret.
 
diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj.asn b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
index 880e81c3b1..719119f418 100644
--- a/lib/asn1/test/asn1_SUITE_data/InfObj.asn
+++ b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
@@ -255,6 +255,51 @@ Multiple-Optionals ::= SEQUENCE {
    t3 [2] MULTIPLE-OPTIONALS.&T3 ({Multiple-Optionals-Set}{@id}) OPTIONAL
 }
 
+-- Test different ways of constructing object sets.
+
+OBJECT-SET-TEST ::= CLASS {
+    &id INTEGER UNIQUE,
+    &Type
+} WITH SYNTAX {
+    &id IS &Type
+}
+
+ObjectSetTest{OBJECT-SET-TEST:ObjectSet} ::=
+  SEQUENCE {
+     id   OBJECT-SET-TEST.&id   ({ObjectSet}),
+     type OBJECT-SET-TEST.&Type ({ObjectSet}{@id})
+  }
+
+ost1 OBJECT-SET-TEST ::= { 1 IS BIT STRING }
+ost2 OBJECT-SET-TEST ::= { 2 IS OCTET STRING }
+ost3 OBJECT-SET-TEST ::= { 3 IS ENUMERATED {donald,scrooge} }
+ost4 OBJECT-SET-TEST ::= { 4 IS BOOLEAN }
+ost5 OBJECT-SET-TEST ::= { 5 IS INTEGER (0..15) }
+
+Ost12    OBJECT-SET-TEST ::= { ost1 | ost2 }
+Ost123   OBJECT-SET-TEST ::= { ost3 | Ost12 }
+Ost1234  OBJECT-SET-TEST ::= { Ost123 | ost4 }
+Ost45    OBJECT-SET-TEST ::= { ost4 | ost5 }
+Ost12345 OBJECT-SET-TEST ::= { Ost123 | Ost45 }
+
+OstSeq12 ::= ObjectSetTest{ {Ost12} }
+OstSeq123 ::= ObjectSetTest{ {Ost123} }
+OstSeq1234 ::= ObjectSetTest{ {Ost1234} }
+OstSeq45 ::= ObjectSetTest{ {Ost45} }
+OstSeq12345 ::= ObjectSetTest{ {Ost12345} }
+
+ExOst12    OBJECT-SET-TEST ::= { ost1, ..., ost2 }
+ExOst123   OBJECT-SET-TEST ::= { ost3, ..., ExOst12 }
+--ExOst1234  OBJECT-SET-TEST ::= { ExOst123, ..., ost4 }
+ExOst45    OBJECT-SET-TEST ::= { ost4, ..., ost5 }
+ExOst12345 OBJECT-SET-TEST ::= { ExOst123, ..., ExOst45 }
+
+ExOstSeq12 ::= ObjectSetTest{ {ExOst12} }
+ExOstSeq123 ::= ObjectSetTest{ {ExOst123} }
+--ExOstSeq1234 ::= ObjectSetTest{ {ExOst1234} }
+ExOstSeq45 ::= ObjectSetTest{ {ExOst45} }
+ExOstSeq12345 ::= ObjectSetTest{ {ExOst12345} }
+
 END
 
 
diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl
index 311595cfda..37c134b1b9 100644
--- a/lib/asn1/test/testInfObj.erl
+++ b/lib/asn1/test/testInfObj.erl
@@ -118,7 +118,41 @@ main(_Erule) ->
     roundtrip('InfObj', 'Multiple-Optionals',
 	      {'Multiple-Optionals',1,42,true,asn1_NOVALUE}),
     roundtrip('InfObj', 'Multiple-Optionals',
-	      {'Multiple-Optionals',1,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}).
+	      {'Multiple-Optionals',1,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}),
+
+    test_objset('OstSeq12', [1,2]),
+    test_objset('OstSeq123', [1,2,3]),
+    test_objset('OstSeq1234', [1,2,3,4]),
+    test_objset('OstSeq45', [4,5]),
+    test_objset('OstSeq12345', [1,2,3,4,5]),
+
+    test_objset('ExOstSeq12', [1,2]),
+    test_objset('ExOstSeq123', [1,2,3]),
+    %%test_objset('ExOstSeq1234', [1,2,3,4]),
+    test_objset('ExOstSeq45', [4,5]),
+    test_objset('ExOstSeq12345', [1,2,3,4,5]),
+
+    ok.
+
+test_objset(Type, Keys) ->
+    _ = [test_object(Type, Key) || Key <- Keys],
+    _ = [(catch test_object(Type, Key)) ||
+	    Key <- lists:seq(1, 5) -- Keys],
+    ok.
+
+test_object(T, 1) ->
+    roundtrip('InfObj', T, {T,1,<<42:7>>});
+test_object(T, 2) ->
+    roundtrip('InfObj', T, {T,2,<<"abc">>});
+test_object(T, 3) ->
+    roundtrip('InfObj', T, {T,3,donald}),
+    roundtrip('InfObj', T, {T,3,scrooge});
+test_object(T, 4) ->
+    roundtrip('InfObj', T, {T,4,true}),
+    roundtrip('InfObj', T, {T,4,false});
+test_object(T, 5) ->
+    roundtrip('InfObj', T, {T,5,0}),
+    roundtrip('InfObj', T, {T,5,15}).
 
 roundtrip(M, T, V) ->
     asn1_test_lib:roundtrip(M, T, V).