summaryrefslogtreecommitdiffstats
path: root/net/base/x509_certificate_win.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-22 02:37:48 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-22 02:37:48 +0000
commit45ceea944499f4f81f298a2e456d0ed720656310 (patch)
treedd65abcb07b47e3f6153448af27564a13c8797f7 /net/base/x509_certificate_win.cc
parenta9ec0b5dae2c77a4d722d1a9750d2c2659dfb168 (diff)
downloadchromium_src-45ceea944499f4f81f298a2e456d0ed720656310.zip
chromium_src-45ceea944499f4f81f298a2e456d0ed720656310.tar.gz
chromium_src-45ceea944499f4f81f298a2e456d0ed720656310.tar.bz2
Address post-review feedback for r82214. In addition, no longer attempt to gracefully recover from read errors when deserializing a X509Certificate from a Pickle.
R=wtc BUG=7065 TEST=none Review URL: http://codereview.chromium.org/6880094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/x509_certificate_win.cc')
-rw-r--r--net/base/x509_certificate_win.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/base/x509_certificate_win.cc b/net/base/x509_certificate_win.cc
index fd5076d..367f4ed 100644
--- a/net/base/x509_certificate_win.cc
+++ b/net/base/x509_certificate_win.cc
@@ -1006,8 +1006,8 @@ SHA1Fingerprint X509Certificate::CalculateFingerprint(
// static
X509Certificate::OSCertHandle
-X509Certificate::ReadCertHandleFromPickle(const Pickle& pickle,
- void** pickle_iter) {
+X509Certificate::ReadOSCertHandleFromPickle(const Pickle& pickle,
+ void** pickle_iter) {
const char* data;
int length;
if (!pickle.ReadData(pickle_iter, &data, &length))
@@ -1026,8 +1026,8 @@ X509Certificate::ReadCertHandleFromPickle(const Pickle& pickle,
}
// static
-bool X509Certificate::WriteCertHandleToPickle(OSCertHandle cert_handle,
- Pickle* pickle) {
+bool X509Certificate::WriteOSCertHandleToPickle(OSCertHandle cert_handle,
+ Pickle* pickle) {
DWORD length = 0;
if (!CertSerializeCertificateStoreElement(cert_handle, 0, NULL, &length))
return false;