1 files changed, 42 insertions, 2 deletions

diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
index 8b8e279..360ff3f 100644
--- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
+++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp
@@ -42,6 +42,7 @@
 
 #include <keyhi.h>
 #include <prprf.h>
+#include <unicode/uidna.h>
 
 #include "app/l10n_util.h"
 #include "base/i18n/number_formatting.h"
@@ -166,6 +167,43 @@ std::string ProcessRawBits(SECItem* data) {
   return ProcessRawBytes(&bytedata);
 }
 
+std::string ProcessIDN(const std::string& input) {
+  // Convert the ASCII input to a string16 for ICU.
+  string16 input16;
+  input16.reserve(input.length());
+  std::copy(input.begin(), input.end(), std::back_inserter(input16));
+
+  string16 output16;
+  output16.resize(input.length());
+
+  UErrorCode status = U_ZERO_ERROR;
+  int output_chars = uidna_IDNToUnicode(input16.data(), input.length(),
+                                        &output16[0], output16.length(),
+                                        UIDNA_DEFAULT, NULL, &status);
+  if (status == U_ZERO_ERROR) {
+    output16.resize(output_chars);
+  } else if (status != U_BUFFER_OVERFLOW_ERROR) {
+    return input;
+  } else {
+    output16.resize(output_chars);
+    output_chars = uidna_IDNToUnicode(input16.data(), input.length(),
+                                      &output16[0], output16.length(),
+                                      UIDNA_DEFAULT, NULL, &status);
+    if (status != U_ZERO_ERROR)
+      return input;
+    DCHECK_EQ(static_cast<size_t>(output_chars), output16.length());
+    output16.resize(output_chars);  // Just to be safe.
+  }
+
+  if (input16 == output16)
+    return input;  // Input did not contain any encoded data.
+
+  // Input contained encoded data, return formatted string showing original and
+  // decoded forms.
+  return l10n_util::GetStringFUTF8(IDS_CERT_INFO_IDN_VALUE_FORMAT,
+                                   input16, output16);
+}
+
 std::string DumpOidString(SECItem* oid) {
   char* pr_string = CERT_GetOidString(oid);
   if (pr_string) {
@@ -383,7 +421,6 @@ std::string GetOIDText(SECItem* oid) {
   return DumpOidString(oid);
 }
 
-
 // Get a display string from a Relative Distinguished Name.
 std::string ProcessRDN(CERTRDN* rdn) {
   std::string rv;
@@ -397,6 +434,8 @@ std::string ProcessRDN(CERTRDN* rdn) {
       rv += " = ";
       std::string value(reinterpret_cast<char*>(decode_item->data),
                         decode_item->len);
+      if (SECOID_FindOIDTag(&avas[i]->type) == SEC_OID_AVA_COMMON_NAME)
+        value = ProcessIDN(value);
       rv += value;
       SECITEM_FreeItem(decode_item, PR_TRUE);
     }
@@ -501,6 +540,7 @@ std::string ProcessGeneralName(PRArenaPool* arena,
       key = l10n_util::GetStringUTF8(IDS_CERT_GENERAL_NAME_DNS_NAME);
       value = std::string(reinterpret_cast<char*>(current->name.other.data),
                           current->name.other.len);
+      value = ProcessIDN(value);
       break;
     case certX400Address:
       key = l10n_util::GetStringUTF8(IDS_CERT_GENERAL_NAME_X400_ADDRESS);
@@ -568,7 +608,7 @@ std::string ProcessGeneralNames(PRArenaPool* arena,
     std::string text = ProcessGeneralName(arena, current);
     if (text.empty())
       break;
-    rv += text + '\n';
+    rv += text;
     current = CERT_GetNextGeneralName(current);
   } while (current != name_list);
   return rv;