summaryrefslogtreecommitdiffstats
path: root/net/base/cert_database_mac.cc
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 18:49:47 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 18:49:47 +0000
commit9aed77b6dace047bff676a7cdcfef345a858d1a7 (patch)
treefddd5e0fac4ee39b6c79af56871f022472f276d9 /net/base/cert_database_mac.cc
parent2779491e15b4a157b6351e20bb0f2dd26f6d84de (diff)
downloadchromium_src-9aed77b6dace047bff676a7cdcfef345a858d1a7.zip
chromium_src-9aed77b6dace047bff676a7cdcfef345a858d1a7.tar.gz
chromium_src-9aed77b6dace047bff676a7cdcfef345a858d1a7.tar.bz2
Adds support for the <keygen> element to Windows, matching
support present on Linux and Mac OS X. Contributed by Ryan Sleevi <ryan.sleevi@gmail.com>. Original review URL: http://codereview.chromium.org/843005 R=wtc BUG=148 TEST=KeygenHandler.SmokeTest Review URL: http://codereview.chromium.org/1591006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/cert_database_mac.cc')
-rw-r--r--net/base/cert_database_mac.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/base/cert_database_mac.cc b/net/base/cert_database_mac.cc
index 96ab9e5..2fa3340 100644
--- a/net/base/cert_database_mac.cc
+++ b/net/base/cert_database_mac.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,15 +8,13 @@
#include "base/logging.h"
#include "net/base/net_errors.h"
+#include "net/base/x509_certificate.h"
namespace net {
CertDatabase::CertDatabase() {
}
-void CertDatabase::Init() {
-}
-
int CertDatabase::CheckUserCert(X509Certificate* cert) {
if (!cert)
return ERR_CERT_INVALID;
@@ -44,14 +42,14 @@ int CertDatabase::CheckUserCert(X509Certificate* cert) {
int CertDatabase::AddUserCert(X509Certificate* cert) {
OSStatus err = SecCertificateAddToKeychain(cert->os_cert_handle(), NULL);
- switch(err) {
+ switch (err) {
case noErr:
case errSecDuplicateItem:
return OK;
default:
LOG(ERROR) << "CertDatabase failed to add cert to keychain: " << err;
// TODO(snej): Map the error code more intelligently.
- return ERR_ERR_ADD_USER_CERT_FAILED;
+ return ERR_ADD_USER_CERT_FAILED;
}
}