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/test/asn1_SUITE_data/DoubleEllipses.asn | 19 ++++++++++++++++++-
 lib/asn1/test/testDoubleEllipses.erl             |  6 +++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'lib/asn1/test')

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


From e073ffc39c29dcec5dec0a0af070952e03c1fa8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 6 Mar 2015 14:53:32 +0100
Subject: asn1ct_gen: Correct generation of .hrl files for multiple ellipses

---
 lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn | 12 ++++++++++++
 lib/asn1/test/testDoubleEllipses.erl             |  8 ++++++++
 2 files changed, 20 insertions(+)

(limited to 'lib/asn1/test')

diff --git a/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn b/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
index a96425cbea..846c3e7569 100644
--- a/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
+++ b/lib/asn1/test/asn1_SUITE_data/DoubleEllipses.asn
@@ -59,6 +59,18 @@ SeqAltV2 ::= SEQUENCE
    g INTEGER
  }
 
+SeqDoubleEmpty1 ::= SEQUENCE {
+   ...,
+   ...
+}
+
+SeqDoubleEmpty2 ::= SEQUENCE {
+   a BOOLEAN,
+   b INTEGER OPTIONAL,
+   ...,
+   ...
+}
+
 Set ::= SET {
    a  INTEGER,
    ...,
diff --git a/lib/asn1/test/testDoubleEllipses.erl b/lib/asn1/test/testDoubleEllipses.erl
index 3caa166ae0..bd6831bf1e 100644
--- a/lib/asn1/test/testDoubleEllipses.erl
+++ b/lib/asn1/test/testDoubleEllipses.erl
@@ -58,6 +58,14 @@ main(_Rules) ->
 	      #'SetAltV2'{a=10,d=12,
 			  b = <<2#1010:4>>,
 			  e=true,h="PS",i=13,c=false,f=14,g=16}),
+
+    roundtrip('SeqDoubleEmpty1',
+	      {'SeqDoubleEmpty1'}),
+    roundtrip('SeqDoubleEmpty2',
+	      {'SeqDoubleEmpty2',true,42}),
+    roundtrip('SeqDoubleEmpty2',
+	      {'SeqDoubleEmpty2',true,asn1_NOVALUE}),
+
     ok.
 
 roundtrip(T, V) ->
-- 
cgit v1.2.3