Reimplements net::AddressList without struct addrinfo.

chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 33 matching lines @@
 #include <prprf.h>
 #include <unicode/uidna.h>
 
 #include "base/i18n/number_formatting.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "crypto/scoped_nss_types.h"
 #include "grit/generated_resources.h"
+#include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
 #include "net/third_party/mozilla_security_manager/nsNSSCertTrust.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 std::string BMPtoUTF8(PRArenaPool* arena, unsigned char* data,
                       unsigned int len) {
   if (len % 2 != 0)
     return l10n_util::GetStringUTF8(IDS_CERT_EXTENSION_DUMP_ERROR);
@@ skipping 457 matching lines @@
       key = l10n_util::GetStringUTF8(IDS_CERT_GENERAL_NAME_EDI_PARTY_NAME);
       value = ProcessRawBytes(&current->name.other);
       break;
     case certURI:
       key = l10n_util::GetStringUTF8(IDS_CERT_GENERAL_NAME_URI);
       value = std::string(reinterpret_cast<char*>(current->name.other.data),
                           current->name.other.len);
       break;
     case certIPAddress: {
       key = l10n_util::GetStringUTF8(IDS_CERT_GENERAL_NAME_IP_ADDRESS);
-      struct addrinfo addr = {0};
-      if (current->name.other.len == 4) {
-        struct sockaddr_in addr4 = {0};
-        addr.ai_addr = reinterpret_cast<sockaddr*>(&addr4);
-        addr.ai_addrlen = sizeof(addr4);
-        addr.ai_family = AF_INET;
-        addr4.sin_family = addr.ai_family;
-        memcpy(&addr4.sin_addr, current->name.other.data,
-               current->name.other.len);
-        value = net::NetAddressToString(&addr);
-      } else if (current->name.other.len == 16) {
-        struct sockaddr_in6 addr6 = {0};
-        addr.ai_addr = reinterpret_cast<sockaddr*>(&addr6);
-        addr.ai_addrlen = sizeof(addr6);
-        addr.ai_family = AF_INET6;
-        addr6.sin6_family = addr.ai_family;
-        memcpy(&addr6.sin6_addr, current->name.other.data,
-               current->name.other.len);
-        value = net::NetAddressToString(&addr);
-      }
+      net::IPAddressNumber ip(
+          current->name.other.data,
+          current->name.other.data + current->name.other.len);
+      value = net::IPEndPoint(ip, 0).ToStringWithoutPort();
       if (value.empty()) {
         // Invalid IP address.
         value = ProcessRawBytes(&current->name.other);
       }
       break;
     }
     case certRegisterID:
       key = l10n_util::GetStringUTF8(IDS_CERT_GENERAL_NAME_REGISTERED_ID);
       value = DumpOidString(&current->name.other);
       break;
@@ skipping 496 matching lines @@
   if (cert->nickname && trust.HasAnyUser())
     return net::USER_CERT;
   if (trust.HasAnyCA() || CERT_IsCACert(cert, NULL))
     return net::CA_CERT;
   if (trust.HasPeer(PR_TRUE, PR_FALSE, PR_FALSE))
     return net::SERVER_CERT;
   return net::UNKNOWN_CERT;
 }
 
 }  // namespace mozilla_security_manager