Commit 0b6e3993 authored by stevenjb@google.com's avatar stevenjb@google.com

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
parent d3b372e3
......@@ -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>)
......
......@@ -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()));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment