Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Side by Side Diff: chrome/browser/gtk/certificate_manager.cc

Issue 2733014: gtk: Certificate viewer should show both A-label and U-label for CN and SubjectAltName IDNs (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: clarify comment Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/gtk/certificate_viewer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/gtk/certificate_manager.h" 5 #include "chrome/browser/gtk/certificate_manager.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #include <pk11pub.h> 9 #include <pk11pub.h>
10 10
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 if (org.empty()) 242 if (org.empty())
243 org = Stringize(CERT_GetCommonName(&cert->subject)); 243 org = Stringize(CERT_GetCommonName(&cert->subject));
244 OrgTreeMap::iterator org_tree_map_iter = org_tree_map.find(org); 244 OrgTreeMap::iterator org_tree_map_iter = org_tree_map.find(org);
245 if (org_tree_map_iter == org_tree_map.end()) { 245 if (org_tree_map_iter == org_tree_map.end()) {
246 GtkTreeIter iter; 246 GtkTreeIter iter;
247 gtk_tree_store_append(store_, &iter, NULL); 247 gtk_tree_store_append(store_, &iter, NULL);
248 gtk_tree_store_set(store_, &iter, CERT_NAME, org.c_str(), -1); 248 gtk_tree_store_set(store_, &iter, CERT_NAME, org.c_str(), -1);
249 org_tree_map_iter = org_tree_map.insert(std::make_pair(org, 249 org_tree_map_iter = org_tree_map.insert(std::make_pair(org,
250 iter)).first; 250 iter)).first;
251 } 251 }
252 std::string name = Stringize(CERT_GetCommonName(&cert->subject)); 252 std::string name = psm::ProcessIDN(
253 Stringize(CERT_GetCommonName(&cert->subject)));
253 if (name.empty() && cert->nickname) { 254 if (name.empty() && cert->nickname) {
254 name = cert->nickname; 255 name = cert->nickname;
255 // Hack copied from mozilla: Cut off text before first :, which seems to 256 // Hack copied from mozilla: Cut off text before first :, which seems to
256 // just be the token name. 257 // just be the token name.
257 size_t colon_pos = name.find(':'); 258 size_t colon_pos = name.find(':');
258 if (colon_pos != std::string::npos) 259 if (colon_pos != std::string::npos)
259 name = name.substr(colon_pos + 1); 260 name = name.substr(colon_pos + 1);
260 } 261 }
261 GtkTreeIter iter; 262 GtkTreeIter iter;
262 gtk_tree_store_append(store_, &iter, &org_tree_map_iter->second); 263 gtk_tree_store_append(store_, &iter, &org_tree_map_iter->second);
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 void CertificateManager::Show() { 444 void CertificateManager::Show() {
444 gtk_util::ShowDialog(dialog_); 445 gtk_util::ShowDialog(dialog_);
445 } 446 }
446 447
447 } // namespace 448 } // namespace
448 449
449 void ShowCertificateManager(gfx::NativeWindow parent) { 450 void ShowCertificateManager(gfx::NativeWindow parent) {
450 base::EnsureNSSInit(); 451 base::EnsureNSSInit();
451 (new CertificateManager(parent))->Show(); 452 (new CertificateManager(parent))->Show();
452 } 453 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/gtk/certificate_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698