From 2eeec1591b1006d318ab7e7862593acb6fa86dd7 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Thu, 18 Sep 2014 16:40:29 +0200
Subject: Fix BER code generation

PKIX1Explicit-2009 did not compile.

This commit was cherry-picked from 3ab3b07a already
merged into master.
---
 lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl   | 13 +++++++------
 lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn | 19 ++++++++++++++++++-
 lib/asn1/test/testDoubleEllipses.erl             |  6 +++++-
 3 files changed, 30 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
index 5fadd0495a..820d19b85c 100644
--- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -234,7 +234,7 @@ gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
 	    asn1ct_name:new(rb),
 	    emit(["   {'",RecordName,"'}.",nl,nl]);
 	{LeadingAttrTerm,PostponedDecArgs} ->
-	    emit([com,nl,nl]),
+	    emit([nl]),
 	    case {LeadingAttrTerm,PostponedDecArgs} of
 		{[],[]} ->
 		    ok;
@@ -413,7 +413,7 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
 	    %% return value as record
 	    emit(["   {'",RecordName,"'}.",nl]);
 	{LeadingAttrTerm,PostponedDecArgs} ->
-	    emit([com,nl,nl]),
+	    emit([nl]),
 	    case {LeadingAttrTerm,PostponedDecArgs} of
 		{[],[]} ->
 		    ok;
@@ -617,18 +617,20 @@ gen_dec_sequence_call1(Erules,TopType,[#'ComponentType'{name=Cname,typespec=Type
     {LA,PostponedDec} = 
 	gen_dec_component(Erules,TopType,Cname,Tags,Type,Num,Prop,
 			  Ext,DecObjInf),
+    emit([com,nl]),
     case Rest of
 	[] ->
 	    {LA ++ LeadingAttrAcc,PostponedDec ++ ArgsAcc};
 	_ ->
-	    emit([com,nl]),
 	    asn1ct_name:new(bytes),
 	    gen_dec_sequence_call1(Erules,TopType,Rest,Num+1,Ext,DecObjInf,
 				   LA++LeadingAttrAcc,PostponedDec++ArgsAcc)
     end;
 
 gen_dec_sequence_call1(_Erules,_TopType,[],1,_,_,_,_) ->
-    no_terms.
+    no_terms;
+gen_dec_sequence_call1(_, _, [], _Num, _, _, LA, PostponedDec) ->
+    {LA, PostponedDec}.
 
 gen_dec_sequence_call2(_Erules,_TopType, {[], [], []}, _Ext,_DecObjInf) ->
     no_terms;
@@ -643,7 +645,6 @@ gen_dec_sequence_call2(Erules,TopType,{Root1,EList,Root2},_Ext,DecObjInf) ->
     %% TagList is the tags of Root2 elements from the first up to and
     %% including the first mandatory element.
     TagList = get_root2_taglist(Root2,[]),
-    emit({com,nl}),
     emit([{curr,tlv}," = ",
 	  {call,ber,skip_ExtensionAdditions,
 	   [{prev,tlv},{asis,TagList}]},com,nl]),
diff --git a/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn b/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
index e90cf55d61..a96425cbea 100644
--- a/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
+++ b/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
@@ -12,6 +12,15 @@ Seq ::= SEQUENCE
    c  BOOLEAN
  }
 
+SeqV1 ::= SEQUENCE
+ {
+   a  INTEGER,
+   ...,
+   b  BOOLEAN,
+   ...
+ }
+
+
 SeqV2 ::= SEQUENCE
  {
    a  INTEGER,
@@ -57,6 +66,14 @@ Set ::= SET {
    c  BOOLEAN
  }
 
+
+SetV1 ::= SET {
+   a  INTEGER,
+   ...,
+   b  BOOLEAN,
+   ...
+ }
+
 SetV2 ::= SET
  {
    a  INTEGER,
@@ -96,4 +113,4 @@ SetAltV2 ::= SET
  }
 
 
-END
\ No newline at end of file
+END
diff --git a/lib/asn1/test/testDoubleEllipses.erl b/lib/asn1/test/testDoubleEllipses.erl
index 4e8972cdfc..3caa166ae0 100644
--- a/lib/asn1/test/testDoubleEllipses.erl
+++ b/lib/asn1/test/testDoubleEllipses.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,17 +24,20 @@
 -include_lib("test_server/include/test_server.hrl").
 
 -record('Seq',{a, c}).
+-record('SeqV1',{a, b}).
 -record('SeqV2',{a, b ,c}).
 -record('SeqAlt',{a,d,b,e,c,f,g}).
 -record('SeqAltV2',{a,d,b,e,h,i,c,f,g}).
 
 -record('Set',{a, c}).
+-record('SetV1',{a, b}).
 -record('SetV2',{a, b ,c}).
 -record('SetAlt',{a,d,b,e,c,f,g}).
 -record('SetAltV2',{a,d,b,e,h,i,c,f,g}).
 
 main(_Rules) ->
     roundtrip('Seq', #'Seq'{a=10,c=true}),
+    roundtrip('SeqV1', #'SeqV1'{a=10,b=false}),
     roundtrip('SeqV2', #'SeqV2'{a=10,b=false,c=true}),
     roundtrip('SeqAlt',
 	      #'SeqAlt'{a=10,d=12,b = <<2#1010:4>>,
@@ -45,6 +48,7 @@ main(_Rules) ->
 			  e=true,h="PS",i=13,c=false,f=14,g=16}),
     
     roundtrip('Set', #'Set'{a=10,c=true}),
+    roundtrip('SetV1', #'SetV1'{a=10,b=false}),
     roundtrip('SetV2', #'SetV2'{a=10,b=false,c=true}),
     roundtrip('SetAlt',
 	      #'SetAlt'{a=10,d=12,
-- 
cgit v1.2.3