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

Side by Side Diff: base/nss_util_internal.h

Issue 6667020: This change loads opencryptoki and uses the TPM for keygen tags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing spurious change Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef BASE_NSS_SLOT_UTIL_H_ 5 #ifndef BASE_NSS_SLOT_UTIL_H_
6 #define BASE_NSS_SLOT_UTIL_H_ 6 #define BASE_NSS_SLOT_UTIL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <secmodt.h> 9 #include <secmodt.h>
10 10
11 // These functions return a type defined in an NSS header, and so cannot be 11 // These functions return a type defined in an NSS header, and so cannot be
12 // declared in nss_util.h. Hence, they are declared here. 12 // declared in nss_util.h. Hence, they are declared here.
13 13
14 namespace base { 14 namespace base {
15 15
16 // Returns a reference to the default NSS key slot. Caller must release 16 // Returns a reference to the default NSS key slot. Caller must release
17 // reference with PK11_FreeSlot. 17 // reference with PK11_FreeSlot.
18 PK11SlotInfo* GetDefaultNSSKeySlot(); 18 PK11SlotInfo* GetDefaultNSSKeySlot();
19 19
20 // On ChromeOS, returns a reference to the builtin hardware TPM
21 // slot. Caller must release reference with PK11_FreeSlot. If no
22 // hardware key is present, will return NULL. On other OSs, This is
23 // the same as GetDefaultNSSKeySlot().
24 PK11SlotInfo* GetRsaKeySlot();
25
20 } // namespace base 26 } // namespace base
21 27
22 #endif // BASE_NSS_UTIL_H_ 28 #endif // BASE_NSS_UTIL_H_
OLDNEW
« base/nss_util.cc ('K') | « base/nss_util.cc ('k') | net/base/keygen_handler_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698