diff options
| author | Anders Svensson <[email protected]> | 2011-06-27 16:43:37 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-06-27 16:43:37 +0200 |
| commit | bd6666300edb76e09c07508e3513f7bdde985b43 (patch) | |
| tree | 1e735ae4a1ab2b63597f43ec342cefcd77513563 /lib/asn1/src/asn1rt_check.erl | |
| parent | 916e80959746c467ff858538e35f3c0105dbbced (diff) | |
| parent | 1049243404cc52cad5ce1f1d2d37383a2ca06160 (diff) | |
| download | otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.gz otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.bz2 otp-bd6666300edb76e09c07508e3513f7bdde985b43.zip | |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'lib/asn1/src/asn1rt_check.erl')
| -rw-r--r-- | lib/asn1/src/asn1rt_check.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1rt_check.erl b/lib/asn1/src/asn1rt_check.erl index 59a74a7078..24a2a3802d 100644 --- a/lib/asn1/src/asn1rt_check.erl +++ b/lib/asn1/src/asn1rt_check.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. +%% Copyright Ericsson AB 2001-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -311,7 +311,7 @@ transform_to_EXTERNAL1990([Data_val_desc,Data_value],Acc) when is_list(Data_valu Data_val_desc|Acc])); transform_to_EXTERNAL1990([Data_val_desc,Data_value],Acc) when is_binary(Data_value)-> - list_to_tuple(lists:reverse([{'octet-aligned',binary_to_list(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)-> list_to_tuple(lists:reverse([{'octet-aligned',Data_value}|Acc])). |