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

Side by Side Diff: net/cert/x509_certificate_nss.cc

Issue 23567010: Fixing a problem introduced when "Unknown" certs were renamed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « net/cert/cert_type.h ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/cert/x509_certificate.h" 5 #include "net/cert/x509_certificate.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <cryptohi.h> 8 #include <cryptohi.h>
9 #include <keyhi.h> 9 #include <keyhi.h>
10 #include <nss.h> 10 #include <nss.h>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 99 }
100 // TODO(gspencer): Internationalize this. It's wrong to assume English 100 // TODO(gspencer): Internationalize this. It's wrong to assume English
101 // here. 101 // here.
102 result = base::StringPrintf("%s's %s ID", subject_name.c_str(), 102 result = base::StringPrintf("%s's %s ID", subject_name.c_str(),
103 issuer_.GetDisplayName().c_str()); 103 issuer_.GetDisplayName().c_str());
104 break; 104 break;
105 } 105 }
106 case SERVER_CERT: 106 case SERVER_CERT:
107 result = subject_.GetDisplayName(); 107 result = subject_.GetDisplayName();
108 break; 108 break;
109 case UNKNOWN_CERT: 109 case OTHER_CERT:
110 default: 110 default:
111 break; 111 break;
112 } 112 }
113 return result; 113 return result;
114 } 114 }
115 115
116 void X509Certificate::GetSubjectAltName( 116 void X509Certificate::GetSubjectAltName(
117 std::vector<std::string>* dns_names, 117 std::vector<std::string>* dns_names,
118 std::vector<std::string>* ip_addrs) const { 118 std::vector<std::string>* ip_addrs) const {
119 x509_util::GetSubjectAltName(cert_handle_, dns_names, ip_addrs); 119 x509_util::GetSubjectAltName(cert_handle_, dns_names, ip_addrs);
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 } 260 }
261 261
262 // static 262 // static
263 void X509Certificate::GetPublicKeyInfo(OSCertHandle cert_handle, 263 void X509Certificate::GetPublicKeyInfo(OSCertHandle cert_handle,
264 size_t* size_bits, 264 size_t* size_bits,
265 PublicKeyType* type) { 265 PublicKeyType* type) {
266 x509_util::GetPublicKeyInfo(cert_handle, size_bits, type); 266 x509_util::GetPublicKeyInfo(cert_handle, size_bits, type);
267 } 267 }
268 268
269 } // namespace net 269 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/cert_type.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698