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

Unified Diff: net/base/cert_database_nss.cc

Issue 1591006: Adds support for the <keygen> element to Windows, matching... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Fix keygen_handler_nss.cc compilation errors. Fix more nits. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/cert_database_mac.cc ('k') | net/base/cert_database_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/cert_database_nss.cc
===================================================================
--- net/base/cert_database_nss.cc (revision 43288)
+++ net/base/cert_database_nss.cc (working copy)
@@ -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.
@@ -16,11 +16,12 @@
#include "base/scoped_ptr.h"
#include "base/nss_util.h"
#include "net/base/net_errors.h"
+#include "net/base/x509_certificate.h"
namespace net {
CertDatabase::CertDatabase() {
- Init();
+ base::EnsureNSSInit();
}
int CertDatabase::CheckUserCert(X509Certificate* cert_obj) {
@@ -74,14 +75,10 @@
NULL);
if (!slot) {
LOG(ERROR) << "Couldn't import user certificate.";
- return ERR_ERR_ADD_USER_CERT_FAILED;
+ return ERR_ADD_USER_CERT_FAILED;
}
PK11_FreeSlot(slot);
return OK;
}
-void CertDatabase::Init() {
- base::EnsureNSSInit();
-}
-
} // namespace net
« no previous file with comments | « net/base/cert_database_mac.cc ('k') | net/base/cert_database_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698