Pass both hostname and port into SSLClientSocket

chrome/browser/cocoa/ssl_client_certificate_selector.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl_client_certificate_selector.h"
 
 #import <SecurityInterface/SFChooseIdentityPanel.h>
 
 #include <vector>
 
 #import "app/l10n_util_mac.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/scoped_cftyperef.h"
 #import "base/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/constrained_window_mac.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/ssl/ssl_client_auth_handler.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
+#include "net/base/net_util.h"
 #include "net/base/x509_certificate.h"
 
 namespace {
 
 class ConstrainedSFChooseIdentityPanel
     : public ConstrainedWindowMacDelegateSystemSheet {
  public:
   ConstrainedSFChooseIdentityPanel(SFChooseIdentityPanel* panel,
                                    id delegate, SEL didEndSelector,
                                    NSArray* identities, NSString* message)
@@ skipping 133 matching lines @@
   }
 
   // Get the message to display:
   NSString* title = l10n_util::GetNSString(IDS_CLIENT_CERT_DIALOG_TITLE);
   NSString* message = l10n_util::GetNSStringF(
       IDS_CLIENT_CERT_DIALOG_TEXT,
       ASCIIToUTF16(certRequestInfo_->host_and_port));
 
   // Create and set up a system choose-identity panel.
   SFChooseIdentityPanel* panel = [[SFChooseIdentityPanel alloc] init];
-  NSString* domain = base::SysUTF8ToNSString(
-      "https://" + certRequestInfo_->host_and_port);
-  // Setting the domain causes the dialog to record the preferred
-  // identity in the system keychain.
-  [panel setDomain:domain];
+  std::string host;
+  int port;
+  if (net::ParseHostAndPort(certRequestInfo_->host_and_port, &host, &port)) {
+    // Safari does not include the port number in its identity preferences, so
+    // similarly strip it off.
+    NSString* domain = base::SysUTF8ToNSString("https://" + host);
+    // Setting the domain causes the dialog to record the preferred
+    // identity in the system keychain.
+    [panel setDomain:domain];
+  } else {
+    NOTREACHED();
+  }
   [panel setInformativeText:message];
   [panel setDefaultButtonTitle:l10n_util::GetNSString(IDS_OK)];
   [panel setAlternateButtonTitle:l10n_util::GetNSString(IDS_CANCEL)];
   SecPolicyRef sslPolicy;
   if (net::X509Certificate::CreateSSLClientPolicy(&sslPolicy) == noErr) {
     [panel setPolicies:(id)sslPolicy];
     CFRelease(sslPolicy);
   }
 
   window_ =
       parent->CreateConstrainedDialog(new ConstrainedSFChooseIdentityPanel(
           panel, self,
           @selector(sheetDidEnd:returnCode:context:),
           identities_, title));
   // Note: SFChooseIdentityPanel does not take a reference to itself while the
   // sheet is open. Don't release the ownership claim until the sheet has ended
   // in |-sheetDidEnd:returnCode:context:|.
 }
 
 @end