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

Side by Side Diff: crypto/nss_util.cc

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to r235279 Created 7 years, 1 month 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
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 "crypto/nss_util.h" 5 #include "crypto/nss_util.h"
6 #include "crypto/nss_util_internal.h" 6 #include "crypto/nss_util_internal.h"
7 7
8 #include <nss.h> 8 #include <nss.h>
9 #include <pk11pub.h> 9 #include <pk11pub.h>
10 #include <plarena.h> 10 #include <plarena.h>
(...skipping 30 matching lines...) Expand all
41 #include "base/threading/thread_checker.h" 41 #include "base/threading/thread_checker.h"
42 #include "base/threading/thread_restrictions.h" 42 #include "base/threading/thread_restrictions.h"
43 #include "build/build_config.h" 43 #include "build/build_config.h"
44 44
45 // USE_NSS means we use NSS for everything crypto-related. If USE_NSS is not 45 // USE_NSS means we use NSS for everything crypto-related. If USE_NSS is not
46 // defined, such as on Mac and Windows, we use NSS for SSL only -- we don't 46 // defined, such as on Mac and Windows, we use NSS for SSL only -- we don't
47 // use NSS for crypto or certificate verification, and we don't use the NSS 47 // use NSS for crypto or certificate verification, and we don't use the NSS
48 // certificate and key databases. 48 // certificate and key databases.
49 #if defined(USE_NSS) 49 #if defined(USE_NSS)
50 #include "base/synchronization/lock.h" 50 #include "base/synchronization/lock.h"
51 #include "crypto/crypto_module_blocking_password_delegate.h" 51 #include "crypto/nss_crypto_module_delegate.h"
52 #endif // defined(USE_NSS) 52 #endif // defined(USE_NSS)
53 53
54 namespace crypto { 54 namespace crypto {
55 55
56 namespace { 56 namespace {
57 57
58 #if defined(OS_CHROMEOS) 58 #if defined(OS_CHROMEOS)
59 const char kNSSDatabaseName[] = "Real NSS database"; 59 const char kNSSDatabaseName[] = "Real NSS database";
60 60
61 // Constants for loading the Chrome OS TPM-backed PKCS #11 library. 61 // Constants for loading the Chrome OS TPM-backed PKCS #11 library.
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 1045
1046 PK11SlotInfo* GetPublicNSSKeySlot() { 1046 PK11SlotInfo* GetPublicNSSKeySlot() {
1047 return g_nss_singleton.Get().GetPublicNSSKeySlot(); 1047 return g_nss_singleton.Get().GetPublicNSSKeySlot();
1048 } 1048 }
1049 1049
1050 PK11SlotInfo* GetPrivateNSSKeySlot() { 1050 PK11SlotInfo* GetPrivateNSSKeySlot() {
1051 return g_nss_singleton.Get().GetPrivateNSSKeySlot(); 1051 return g_nss_singleton.Get().GetPrivateNSSKeySlot();
1052 } 1052 }
1053 1053
1054 } // namespace crypto 1054 } // namespace crypto
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698