aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-09-23 11:54:18 +0200
committerLukas Larsson <[email protected]>2011-09-23 11:54:18 +0200
commit312005eb3d09f5bf00ce129c1dd900de1475fc0a (patch)
tree3486d2778dcb18e6bb307b83775db61bb42037e0 /lib/asn1
parent7c11b3f7a00a18fb11918a57ee1d6597ced97a07 (diff)
parentf0a455069f3a68eefd098c6de8863dc6663c36c3 (diff)
downloadotp-312005eb3d09f5bf00ce129c1dd900de1475fc0a.tar.gz
otp-312005eb3d09f5bf00ce129c1dd900de1475fc0a.tar.bz2
otp-312005eb3d09f5bf00ce129c1dd900de1475fc0a.zip
Merge branch 'lukas/asn1/fix_ber_other_testcase/OTP-9573' into dev
* lukas/asn1/fix_ber_other_testcase/OTP-9573: Update ber_bin and ber_bin_v2 to return binaries
Diffstat (limited to 'lib/asn1')
-rw-r--r--lib/asn1/src/asn1ct_value.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/asn1/src/asn1ct_value.erl b/lib/asn1/src/asn1ct_value.erl
index 693e039a13..d099376b1b 100644
--- a/lib/asn1/src/asn1ct_value.erl
+++ b/lib/asn1/src/asn1ct_value.erl
@@ -435,11 +435,11 @@ get_encoding_rule(M) ->
open_type_value(ber) ->
[4,9,111,112,101,110,95,116,121,112,101];
open_type_value(ber_bin) ->
- [4,9,111,112,101,110,95,116,121,112,101];
-% <<4,9,111,112,101,110,95,116,121,112,101>>;
+% [4,9,111,112,101,110,95,116,121,112,101];
+ <<4,9,111,112,101,110,95,116,121,112,101>>;
open_type_value(ber_bin_v2) ->
- [4,9,111,112,101,110,95,116,121,112,101];
-% <<4,9,111,112,101,110,95,116,121,112,101>>;
+% [4,9,111,112,101,110,95,116,121,112,101];
+ <<4,9,111,112,101,110,95,116,121,112,101>>;
open_type_value(per) ->
"\n\topen_type"; %octet string value "open_type"
open_type_value(per_bin) ->