diff options
| author | Erlang/OTP <[email protected]> | 2013-03-13 15:50:57 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-03-13 15:50:57 +0100 |
| commit | df291bae520a2fdd404172fdffaaf040fd939151 (patch) | |
| tree | 55dc869234e3ba8c27a8cf627395465468941013 /lib/asn1/test | |
| parent | cda401b58a3db7213eb14197680d401fd1399de9 (diff) | |
| parent | 5588449531f1a41d05e5d2d4fe5976db643a18e3 (diff) | |
| download | otp-df291bae520a2fdd404172fdffaaf040fd939151.tar.gz otp-df291bae520a2fdd404172fdffaaf040fd939151.tar.bz2 otp-df291bae520a2fdd404172fdffaaf040fd939151.zip | |
Merge branch 'bjorn/asn1/per-decode/OTP-10916' into maint-r16
* bjorn/asn1/per-decode/OTP-10916:
PER: Ensure that the complete encoding is at least one byte
PER/UPER: Correct decoding of ENUMERATEDs with a single value
Diffstat (limited to 'lib/asn1/test')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/Prim.asn1 | 13 | ||||
| -rw-r--r-- | lib/asn1/test/testPrim.erl | 8 |
2 files changed, 21 insertions, 0 deletions
diff --git a/lib/asn1/test/asn1_SUITE_data/Prim.asn1 b/lib/asn1/test/asn1_SUITE_data/Prim.asn1 index 17a5d3490a..c3d54dbbb3 100644 --- a/lib/asn1/test/asn1_SUITE_data/Prim.asn1 +++ b/lib/asn1/test/asn1_SUITE_data/Prim.asn1 @@ -22,6 +22,8 @@ BEGIN Enum ::= ENUMERATED {monday(1),tuesday(2),wednesday(3),thursday(4), friday(5),saturday(6),sunday(7)} + SingleEnumVal ::= ENUMERATED {true} + SingleEnumValExt ::= ENUMERATED {true, ...} ObjId ::= OBJECT IDENTIFIER @@ -35,4 +37,15 @@ BEGIN base (2), exponent (-125..128) } ) + Seq ::= SEQUENCE { + n Null, + i1 INTEGER (0..63), + e1 SingleEnumVal, + i2 INTEGER (0..63), + e2 SingleEnumVal, + i3 INTEGER (0..63), + b Bool, + i4 INTEGER (0..63) + } + END diff --git a/lib/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl index 0d4427ba69..91fb9fffca 100644 --- a/lib/asn1/test/testPrim.erl +++ b/lib/asn1/test/testPrim.erl @@ -513,6 +513,14 @@ enum(Rules) -> case catch asn1_wrapper:encode('Prim','Enum',4) of Enum -> Enum end, ok end, + + case Rules of + Per when Per =:= per; Per =:= uper -> + {ok,<<0>>} = 'Prim':encode('SingleEnumVal', true), + {ok,<<0>>} = 'Prim':encode('SingleEnumValExt', true); + ber -> + ok + end, ok. |