Fix webui cert viewer showing wrong cert chain on NSS and no chain on OpenSSL.

chrome/browser/ui/webui/certificate_viewer_webui.cc

 // Copyright (c) 2012 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/ui/webui/certificate_viewer_webui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"
@@ skipping 24 matching lines @@
   dialog->Show(web_contents, parent);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CertificateViewerDialog
 
 CertificateViewerModalDialog::CertificateViewerModalDialog(
     net::X509Certificate* cert)
     : cert_(cert), webui_(NULL), window_(NULL) {
   // Construct the dialog title from the certificate.
-  net::X509Certificate::OSCertHandles cert_chain;
-  x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(),
-      &cert_chain);
-  title_ = l10n_util::GetStringFUTF16(IDS_CERT_INFO_DIALOG_TITLE,
-      base::UTF8ToUTF16(x509_certificate_model::GetTitle(cert_chain.front())));
+  title_ = l10n_util::GetStringFUTF16(
+      IDS_CERT_INFO_DIALOG_TITLE,
+      base::UTF8ToUTF16(
+          x509_certificate_model::GetTitle(cert_->os_cert_handle())));
 }
 
 CertificateViewerModalDialog::~CertificateViewerModalDialog() {
 }
 
 void CertificateViewerModalDialog::Show(content::WebContents* web_contents,
                                         gfx::NativeWindow parent) {
   window_ = chrome::ShowWebDialog(parent,
                                   web_contents->GetBrowserContext(),
                                   this);
@@ skipping 36 matching lines @@
 std::string CertificateViewerModalDialog::GetDialogArgs() const {
   std::string data;
 
   // Certificate information. The keys in this dictionary's general key
   // correspond to the IDs in the Html page.
   base::DictionaryValue cert_info;
   net::X509Certificate::OSCertHandle cert_hnd = cert_->os_cert_handle();
 
   // Get the certificate chain.
   net::X509Certificate::OSCertHandles cert_chain;
-  x509_certificate_model::GetCertChainFromCert(cert_hnd, &cert_chain);
+  cert_chain.push_back(cert_->os_cert_handle());
+  const net::X509Certificate::OSCertHandles& certs =
+      cert_->GetIntermediateCertificates();
+  cert_chain.insert(cert_chain.end(), certs.begin(), certs.end());
 
   // Certificate usage.
   std::vector<std::string> usages;
   x509_certificate_model::GetUsageStrings(cert_hnd, &usages);
   std::string usagestr;
   for (std::vector<std::string>::iterator it = usages.begin();
       it != usages.end(); ++it) {
     if (usagestr.length() > 0) {
       usagestr += "\n";
     }
@@ skipping 127 matching lines @@
 
 ui::ModalType CertificateViewerDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_NONE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CertificateViewerDialogHandler
 
 CertificateViewerDialogHandler::CertificateViewerDialogHandler(
     CertificateViewerModalDialog* dialog,
-    net::X509Certificate* cert) : cert_(cert), dialog_(dialog) {
-  x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(),
-      &cert_chain_);
+    net::X509Certificate* cert)
+    : cert_(cert), dialog_(dialog) {
+  cert_chain_.push_back(cert_->os_cert_handle());
+  const net::X509Certificate::OSCertHandles& certs =
+      cert_->GetIntermediateCertificates();
+  cert_chain_.insert(cert_chain_.end(), certs.begin(), certs.end());
 }
 
 CertificateViewerDialogHandler::~CertificateViewerDialogHandler() {
 }
 
 void CertificateViewerDialogHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("exportCertificate",
       base::Bind(&CertificateViewerDialogHandler::ExportCertificate,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("requestCertificateFields",
       base::Bind(&CertificateViewerDialogHandler::RequestCertificateFields,
                  base::Unretained(this)));
 }
 
 void CertificateViewerDialogHandler::ExportCertificate(
     const base::ListValue* args) {
   int cert_index = GetCertificateIndex(args);
   if (cert_index < 0)
     return;
 
   NativeWebContentsModalDialog window =
       platform_util::GetTopLevel(dialog_->GetNativeWebContentsModalDialog());
   ShowCertExportDialog(web_ui()->GetWebContents(),
                        window,
-                       cert_chain_[cert_index]);
+                       cert_chain_.begin() + cert_index,
+                       cert_chain_.end());
 }
 
 void CertificateViewerDialogHandler::RequestCertificateFields(
     const base::ListValue* args) {
   int cert_index = GetCertificateIndex(args);
   if (cert_index < 0)
     return;
 
   net::X509Certificate::OSCertHandle cert = cert_chain_[cert_index];
 
@@ skipping 148 matching lines @@
     const base::ListValue* args) const {
   int cert_index;
   double val;
   if (!(args->GetDouble(0, &val)))
     return -1;
   cert_index = static_cast<int>(val);
   if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size()))
     return -1;
   return cert_index;
 }