aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2014-03-26 10:06:32 +0100
committerHans Nilsson <[email protected]>2014-03-26 10:06:32 +0100
commitdbb4cdad43a980e65546fdb572bf0f5cf007fd5a (patch)
treef1fd0ab3dddf51c7289f5c7ba74907d32a9bd87d
parent1728d63eaa2cab40bc7b53c26835605f4b76429f (diff)
parentb1e4ebaee6abbe85ce283ac7981468b7b90ff92d (diff)
downloadotp-dbb4cdad43a980e65546fdb572bf0f5cf007fd5a.tar.gz
otp-dbb4cdad43a980e65546fdb572bf0f5cf007fd5a.tar.bz2
otp-dbb4cdad43a980e65546fdb572bf0f5cf007fd5a.zip
Merge branch 'hans/pubkey/utf8/OTP-11823'
* hans/pubkey/utf8/OTP-11823: pubkey: Fixed unicode conversion
-rw-r--r--lib/public_key/src/pubkey_cert.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index dc8d68c78f..d9288e99bb 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -511,10 +511,10 @@ is_dir_name2(Value, Value) -> true;
is_dir_name2({printableString, Value1}, {printableString, Value2}) ->
string:to_lower(strip_spaces(Value1)) =:=
string:to_lower(strip_spaces(Value2));
-is_dir_name2({utf8String, Value1}, String) -> %% BUGBUG FIX UTF8 conv
- is_dir_name2({printableString, binary_to_list(Value1)}, String);
-is_dir_name2(String, {utf8String, Value1}) -> %% BUGBUG FIX UTF8 conv
- is_dir_name2(String, {printableString, binary_to_list(Value1)});
+is_dir_name2({utf8String, Value1}, String) ->
+ is_dir_name2({printableString, unicode:characters_to_list(Value1)}, String);
+is_dir_name2(String, {utf8String, Value1}) ->
+ is_dir_name2(String, {printableString, unicode:characters_to_list(Value1)});
is_dir_name2(_, _) ->
false.