aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-08-28 14:52:05 +0200
committerHenrik Nord <[email protected]>2012-08-28 14:52:05 +0200
commitf6b0856e2fed9266e81878a6f780f6db2b80c7df (patch)
tree7cc9317f835124ec8fd041c64e3dacc75224f85c /lib
parent7c759662a137c22aaa70bee2fd6284a15c00eff2 (diff)
parent2fb7f9750ee0d7f33d91f6e12c4339a7a64fb481 (diff)
downloadotp-f6b0856e2fed9266e81878a6f780f6db2b80c7df.tar.gz
otp-f6b0856e2fed9266e81878a6f780f6db2b80c7df.tar.bz2
otp-f6b0856e2fed9266e81878a6f780f6db2b80c7df.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/asn1/src/asn1rt_check.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1rt_check.erl b/lib/asn1/src/asn1rt_check.erl
index d9856901b8..35b993fc71 100644
--- a/lib/asn1/src/asn1rt_check.erl
+++ b/lib/asn1/src/asn1rt_check.erl
@@ -311,7 +311,8 @@ transform_to_EXTERNAL1990([Data_val_desc,Data_value],Acc)
when is_binary(Data_value)->
list_to_tuple(lists:reverse([{'single-ASN1-type',Data_value},
Data_val_desc|Acc]));
-transform_to_EXTERNAL1990([Data_value],Acc) when is_list(Data_value)->
+transform_to_EXTERNAL1990([Data_value],Acc)
+ when is_list(Data_value); is_binary(Data_value) ->
list_to_tuple(lists:reverse([{'octet-aligned',Data_value}|Acc])).