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

Side by Side Diff: chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp

Issue 661241: Linux: implement Client SSL Certificate selection UI (Closed)
Patch Set: fix views and chromeos builds hopefully Created 10 years, 9 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
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 22 matching lines...) Expand all
33 * use your version of this file under the terms of the MPL, indicate your 33 * use your version of this file under the terms of the MPL, indicate your
34 * decision by deleting the provisions above and replace them with the notice 34 * decision by deleting the provisions above and replace them with the notice
35 * and other provisions required by the GPL or the LGPL. If you do not delete 35 * and other provisions required by the GPL or the LGPL. If you do not delete
36 * the provisions above, a recipient may use your version of this file under 36 * the provisions above, a recipient may use your version of this file under
37 * the terms of any one of the MPL, the GPL or the LGPL. 37 * the terms of any one of the MPL, the GPL or the LGPL.
38 * 38 *
39 * ***** END LICENSE BLOCK ***** */ 39 * ***** END LICENSE BLOCK ***** */
40 40
41 #include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h" 41 #include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h"
42 42
43 #include <pk11func.h>
44
45 #include "app/l10n_util.h"
46 #include "grit/generated_resources.h"
47
43 namespace mozilla_security_manager { 48 namespace mozilla_security_manager {
44 49
45 std::string GetCertTitle(CERTCertificate* cert) { 50 std::string GetCertTitle(CERTCertificate* cert) {
46 std::string rv; 51 std::string rv;
47 if (cert->nickname) { 52 if (cert->nickname) {
48 rv = cert->nickname; 53 rv = cert->nickname;
49 } else { 54 } else {
50 char* cn = CERT_GetCommonName(&cert->subject); 55 char* cn = CERT_GetCommonName(&cert->subject);
51 if (cn) { 56 if (cn) {
52 rv = cn; 57 rv = cn;
53 PORT_Free(cn); 58 PORT_Free(cn);
54 } else if (cert->subjectName) { 59 } else if (cert->subjectName) {
55 rv = cert->subjectName; 60 rv = cert->subjectName;
56 } else if (cert->emailAddr) { 61 } else if (cert->emailAddr) {
57 rv = cert->emailAddr; 62 rv = cert->emailAddr;
58 } 63 }
59 } 64 }
60 // TODO(mattm): Should we return something other than an empty string when all 65 // TODO(mattm): Should we return something other than an empty string when all
61 // the checks fail? 66 // the checks fail?
62 return rv; 67 return rv;
63 } 68 }
64 69
70 std::string GetCertTokenName(CERTCertificate* cert) {
71 std::string token;
72 if (cert->slot) {
73 token = PK11_GetTokenName(cert->slot);
74 }
75 return token;
76 }
77
65 } // namespace mozilla_security_manager 78 } // namespace mozilla_security_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698