diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 00:51:21 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 00:51:21 +0000 |
| commit | 0b6e39937ffb641b073e5ab6275cc070ba1b88a3 (patch) | |
| tree | 074dd4c5375286163507385fcced29fa39f7e9af | |
| parent | d3b372e36a312920a42720b5a26d82e70a81bff3 (diff) | |
| download | chromium_src-0b6e39937ffb641b073e5ab6275cc070ba1b88a3.zip chromium_src-0b6e39937ffb641b073e5ab6275cc070ba1b88a3.tar.gz chromium_src-0b6e39937ffb641b073e5ab6275cc070ba1b88a3.tar.bz2 | |
Use issuer common name for cert description in network dialog
BUG=chromium-os:18985
TEST=See issue.
Review URL: http://codereview.chromium.org/7628012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96489 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/cros/cert_library.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 8c407be..3012d77 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3446,7 +3446,7 @@ are declared in build/common.gypi. Import and Bind to Device... </message> <message name="IDS_CERT_MANAGER_KEY_FORMAT_LONG" desc="A longer format for keys in the wifi / vpn config dialogs."> - <ph name="ISSUED_BY">$1<ex>Google Inc</ex></ph> [<ph name="ISSUED_TO">$1<ex>John Doe</ex></ph>] + <ph name="ISSUED_BY">$1<ex>Google Inc</ex></ph> [<ph name="ISSUED_TO">$2<ex>John Doe</ex></ph>] </message> <message name="IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT" desc="A format used to create label for hardware-backed keys."> <ph name="KEY_NAME">$1<ex>John Doe</ex></ph> (<ph name="DEVICE">$2<ex>hardware-backed</ex></ph>) diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index 4c4709c..895d752 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -35,7 +35,9 @@ string16 GetDisplayString(net::X509Certificate* cert, bool hardware_backed) { org = cert->subject().organization_names[0]; if (org.empty()) org = cert->subject().GetDisplayName(); - string16 issued_by = UTF8ToUTF16(org); + string16 issued_by = UTF8ToUTF16( + x509_certificate_model::GetIssuerCommonName(cert->os_cert_handle(), + org)); // alternative text string16 issued_to = UTF8ToUTF16( x509_certificate_model::GetCertNameOrNickname(cert->os_cert_handle())); |