diff options
| author | Björn Gustavsson <[email protected]> | 2013-03-14 14:50:35 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-03-14 14:50:35 +0100 |
| commit | 5f764a80aab1af1bbae170f8819fe3c3393b0cb6 (patch) | |
| tree | e747201ce1384c4c917c33077ad04b1eace75ba6 /lib/asn1/test/testPrim.erl | |
| parent | 8e44167cb97ccf51a8ee3ca97449613ef3300514 (diff) | |
| parent | e7f320e1f84da88a96c3bc4a76f43a296a738264 (diff) | |
| download | otp-5f764a80aab1af1bbae170f8819fe3c3393b0cb6.tar.gz otp-5f764a80aab1af1bbae170f8819fe3c3393b0cb6.tar.bz2 otp-5f764a80aab1af1bbae170f8819fe3c3393b0cb6.zip | |
Merge branch 'maint-r16' into maint
* maint-r16:
Prepare release
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/testPrim.erl')
| -rw-r--r-- | lib/asn1/test/testPrim.erl | 8 |
1 files changed, 8 insertions, 0 deletions
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. |