diff options
| author | Henrik Nord <[email protected]> | 2012-08-28 14:51:02 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-08-28 14:51:48 +0200 |
| commit | 2fb7f9750ee0d7f33d91f6e12c4339a7a64fb481 (patch) | |
| tree | 8606972d509c01c8d6935bca894abffdc2eb335d /lib | |
| parent | ee5133a635f08409fc0e943ea79145bc36acbe4f (diff) | |
| parent | 6a69602985c9da9fc105cf4ce1cb434ae5f00f07 (diff) | |
| download | otp-2fb7f9750ee0d7f33d91f6e12c4339a7a64fb481.tar.gz otp-2fb7f9750ee0d7f33d91f6e12c4339a7a64fb481.tar.bz2 otp-2fb7f9750ee0d7f33d91f6e12c4339a7a64fb481.zip | |
Merge branch 'hw/asn1rt_check-transform' into maint
* hw/asn1rt_check-transform:
asn1rt_check: Fix transform_to_EXTERNAL1990 for binary input
OTP-10233
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asn1/src/asn1rt_check.erl | 3 |
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])). |