aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/test/testPrim.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2013-03-13 15:50:57 +0100
committerErlang/OTP <[email protected]>2013-03-13 15:50:57 +0100
commitdf291bae520a2fdd404172fdffaaf040fd939151 (patch)
tree55dc869234e3ba8c27a8cf627395465468941013 /lib/asn1/test/testPrim.erl
parentcda401b58a3db7213eb14197680d401fd1399de9 (diff)
parent5588449531f1a41d05e5d2d4fe5976db643a18e3 (diff)
downloadotp-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/testPrim.erl')
-rw-r--r--lib/asn1/test/testPrim.erl8
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.