diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-05-20 15:32:12 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-05-20 15:32:12 +0200 |
| commit | f51fe0b00300082fe2a937c4575afedd9e113afa (patch) | |
| tree | be8e5f24120fa65d6dc50ccae657712a5b1334b2 /lib/asn1/src/asn1rt_check.erl | |
| parent | 6c6ea3ebe1e031520bf5bf8808c595b935a4b3bc (diff) | |
| parent | 577f5ca0d34793c8a1c502f3e4221e43929b3e33 (diff) | |
| download | otp-f51fe0b00300082fe2a937c4575afedd9e113afa.tar.gz otp-f51fe0b00300082fe2a937c4575afedd9e113afa.tar.bz2 otp-f51fe0b00300082fe2a937c4575afedd9e113afa.zip | |
Merge branch 'kenneth/asn1/longlength/OTP-9303' into dev
* kenneth/asn1/longlength/OTP-9303:
Fixed DRIVER_INIT prototype
Corrected handling of long length in driver and updated test suites
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])). |