aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <dgud@erlang.org>2010-04-13 11:46:12 +0000
committerErlang/OTP <otp@erlang.org>2010-04-13 13:56:26 +0200
commitc21626f453903b05655da48420f106bda31cb2da (patch)
tree5c88d8e9abc4a3d7647f20b8a862c63eab83252c
parent95ca193e2c03afcd7869cbd4e7924ee0c37217b9 (diff)
downloadotp-c21626f453903b05655da48420f106bda31cb2da.tar.gz
otp-c21626f453903b05655da48420f106bda31cb2da.tar.bz2
otp-c21626f453903b05655da48420f106bda31cb2da.zip
Use binaries instead of non-supported lists as argument to crypto:des_cbc_decrypt
-rw-r--r--lib/public_key/src/pubkey_pem.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index abd46fa00e..9fc17b6f73 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 2008-2010. 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
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
%%
@@ -155,7 +155,7 @@ unhex(S) ->
unhex(S, []).
unhex("", Acc) ->
- lists:reverse(Acc);
+ list_to_binary(lists:reverse(Acc));
unhex([D1, D2 | Rest], Acc) ->
unhex(Rest, [erlang:list_to_integer([D1, D2], 16) | Acc]).