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

Side by Side Diff: crypto/nss_util_internal.h

Issue 7209001: Crypto: Add crypto_api to code needed outside of crypto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « crypto/nss_util.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CRYPTO_NSS_UTIL_INTERNAL_H_ 5 #ifndef CRYPTO_NSS_UTIL_INTERNAL_H_
6 #define CRYPTO_NSS_UTIL_INTERNAL_H_ 6 #define CRYPTO_NSS_UTIL_INTERNAL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <secmodt.h> 9 #include <secmodt.h>
10 10
11 #include "crypto/crypto_api.h"
12
11 // These functions return a type defined in an NSS header, and so cannot be 13 // 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. 14 // declared in nss_util.h. Hence, they are declared here.
13 15
14 namespace crypto { 16 namespace crypto {
15 17
16 // Returns a reference to the default NSS key slot for storing 18 // Returns a reference to the default NSS key slot for storing
17 // public-key data only (e.g. server certs). Caller must release 19 // public-key data only (e.g. server certs). Caller must release
18 // returned reference with PK11_FreeSlot. 20 // returned reference with PK11_FreeSlot.
19 PK11SlotInfo* GetPublicNSSKeySlot(); 21 PK11SlotInfo* GetPublicNSSKeySlot();
wtc 2011/06/20 22:35:40 We may want to add CRYPTOAPI to this function for
rvargas (doing something else) 2011/06/20 23:00:37 Done.
20 22
21 // Returns a reference to the default slot for storing private-key and 23 // Returns a reference to the default slot for storing private-key and
22 // mixed private-key/public-key data. Returns a hardware (TPM) NSS 24 // mixed private-key/public-key data. Returns a hardware (TPM) NSS
23 // key slot if on ChromeOS and EnableTPMForNSS() has been called 25 // key slot if on ChromeOS and EnableTPMForNSS() has been called
24 // successfully. Caller must release returned reference with 26 // successfully. Caller must release returned reference with
25 // PK11_FreeSlot. 27 // PK11_FreeSlot.
26 PK11SlotInfo* GetPrivateNSSKeySlot(); 28 CRYPTO_API PK11SlotInfo* GetPrivateNSSKeySlot();
27 29
28 // A helper class that acquires the SECMOD list read lock while the 30 // A helper class that acquires the SECMOD list read lock while the
29 // AutoSECMODListReadLock is in scope. 31 // AutoSECMODListReadLock is in scope.
30 class AutoSECMODListReadLock { 32 class AutoSECMODListReadLock {
31 public: 33 public:
32 AutoSECMODListReadLock(); 34 AutoSECMODListReadLock();
33 ~AutoSECMODListReadLock(); 35 ~AutoSECMODListReadLock();
34 36
35 private: 37 private:
36 SECMODListLock* lock_; 38 SECMODListLock* lock_;
37 DISALLOW_COPY_AND_ASSIGN(AutoSECMODListReadLock); 39 DISALLOW_COPY_AND_ASSIGN(AutoSECMODListReadLock);
38 }; 40 };
39 41
40 } // namespace crypto 42 } // namespace crypto
41 43
42 #endif // CRYPTO_NSS_UTIL_INTERNAL_H_ 44 #endif // CRYPTO_NSS_UTIL_INTERNAL_H_
OLDNEW
« no previous file with comments | « crypto/nss_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698