aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-09-23 11:55:04 +0200
committerLukas Larsson <[email protected]>2011-09-23 11:55:04 +0200
commit92657321ac647f343c6b88985d66a2d611fd982d (patch)
treec89fd48773f7287dc4d5965065a67f63eaf77cf6 /lib
parent9766af5d4bf81bdc66cb7de55484db976e02ac53 (diff)
parent312005eb3d09f5bf00ce129c1dd900de1475fc0a (diff)
downloadotp-92657321ac647f343c6b88985d66a2d611fd982d.tar.gz
otp-92657321ac647f343c6b88985d66a2d611fd982d.tar.bz2
otp-92657321ac647f343c6b88985d66a2d611fd982d.zip
Merge branch 'dev' into major
* dev: Update ber_bin and ber_bin_v2 to return binaries
Diffstat (limited to 'lib')
-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) ->