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

Side by Side Diff: chrome/browser/net/nss_context_linux.cc

Issue 2922423002: Remove NSSCryptoModuleDelegate. (Closed)
Patch Set: Created 3 years, 6 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 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/net/nss_context.h" 5 #include "chrome/browser/net/nss_context.h"
6 6
7 #include "content/public/browser/browser_thread.h" 7 #include "content/public/browser/browser_thread.h"
8 #include "crypto/nss_util_internal.h" 8 #include "crypto/nss_util_internal.h"
9 #include "net/cert/nss_cert_database.h" 9 #include "net/cert/nss_cert_database.h"
10 10
11 namespace { 11 namespace {
12 net::NSSCertDatabase* g_nss_cert_database = NULL; 12 net::NSSCertDatabase* g_nss_cert_database = NULL;
13 } // namespace 13 } // namespace
14 14
15 crypto::ScopedPK11Slot GetPublicNSSKeySlotForResourceContext(
16 content::ResourceContext* context) {
17 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
18 return crypto::ScopedPK11Slot(crypto::GetPersistentNSSKeySlot());
19 }
20
21 crypto::ScopedPK11Slot GetPrivateNSSKeySlotForResourceContext(
22 content::ResourceContext* context,
23 const base::Callback<void(crypto::ScopedPK11Slot)>& callback) {
24 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
25 return crypto::ScopedPK11Slot(crypto::GetPersistentNSSKeySlot());
26 }
27
28 net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext( 15 net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
29 content::ResourceContext* context, 16 content::ResourceContext* context,
30 const base::Callback<void(net::NSSCertDatabase*)>& callback) { 17 const base::Callback<void(net::NSSCertDatabase*)>& callback) {
31 // This initialization is not thread safe. This CHECK ensures that this code 18 // This initialization is not thread safe. This CHECK ensures that this code
32 // is only run on a single thread. 19 // is only run on a single thread.
33 CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); 20 CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
34 if (!g_nss_cert_database) { 21 if (!g_nss_cert_database) {
35 // Linux has only a single persistent slot compared to ChromeOS's separate 22 // Linux has only a single persistent slot compared to ChromeOS's separate
36 // public and private slot. 23 // public and private slot.
37 // Redirect any slot usage to this persistent slot on Linux. 24 // Redirect any slot usage to this persistent slot on Linux.
38 g_nss_cert_database = new net::NSSCertDatabase( 25 g_nss_cert_database = new net::NSSCertDatabase(
39 crypto::ScopedPK11Slot( 26 crypto::ScopedPK11Slot(
40 crypto::GetPersistentNSSKeySlot()) /* public slot */, 27 crypto::GetPersistentNSSKeySlot()) /* public slot */,
41 crypto::ScopedPK11Slot( 28 crypto::ScopedPK11Slot(
42 crypto::GetPersistentNSSKeySlot()) /* private slot */); 29 crypto::GetPersistentNSSKeySlot()) /* private slot */);
43 } 30 }
44 return g_nss_cert_database; 31 return g_nss_cert_database;
45 } 32 }
OLDNEW
« no previous file with comments | « chrome/browser/net/nss_context_chromeos.cc ('k') | chrome/browser/ui/crypto_module_delegate_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698