OLD | NEW |
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 #ifndef CRYPTO_SCOPED_NSS_TYPES_H_ | 5 #ifndef CRYPTO_SCOPED_NSS_TYPES_H_ |
6 #define CRYPTO_SCOPED_NSS_TYPES_H_ | 6 #define CRYPTO_SCOPED_NSS_TYPES_H_ |
7 | 7 |
8 #include <keyhi.h> | 8 #include <keyhi.h> |
9 #include <nss.h> | 9 #include <nss.h> |
10 #include <pk11pub.h> | 10 #include <pk11pub.h> |
11 #include <plarena.h> | 11 #include <plarena.h> |
12 | 12 |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 | 14 |
15 namespace crypto { | 15 namespace crypto { |
16 | 16 |
17 template <typename Type, void (*Destroyer)(Type*)> | 17 template <typename Type, void (*Destroyer)(Type*)> |
18 struct NSSDestroyer { | 18 struct NSSDestroyer { |
| 19 typedef void AllowSelfReset; |
19 void operator()(Type* ptr) const { | 20 void operator()(Type* ptr) const { |
20 Destroyer(ptr); | 21 Destroyer(ptr); |
21 } | 22 } |
22 }; | 23 }; |
23 | 24 |
24 template <typename Type, void (*Destroyer)(Type*, PRBool), PRBool freeit> | 25 template <typename Type, void (*Destroyer)(Type*, PRBool), PRBool freeit> |
25 struct NSSDestroyer1 { | 26 struct NSSDestroyer1 { |
| 27 typedef void AllowSelfReset; |
26 void operator()(Type* ptr) const { | 28 void operator()(Type* ptr) const { |
27 Destroyer(ptr, freeit); | 29 Destroyer(ptr, freeit); |
28 } | 30 } |
29 }; | 31 }; |
30 | 32 |
31 // Define some convenient scopers around NSS pointers. | 33 // Define some convenient scopers around NSS pointers. |
32 typedef scoped_ptr<PK11Context, | 34 typedef scoped_ptr<PK11Context, |
33 NSSDestroyer1<PK11Context, PK11_DestroyContext, PR_TRUE> > | 35 NSSDestroyer1<PK11Context, PK11_DestroyContext, PR_TRUE> > |
34 ScopedPK11Context; | 36 ScopedPK11Context; |
35 typedef scoped_ptr<PK11SlotInfo, NSSDestroyer<PK11SlotInfo, PK11_FreeSlot> > | 37 typedef scoped_ptr<PK11SlotInfo, NSSDestroyer<PK11SlotInfo, PK11_FreeSlot> > |
(...skipping 14 matching lines...) Expand all Loading... |
50 ScopedSECAlgorithmID; | 52 ScopedSECAlgorithmID; |
51 typedef scoped_ptr<SECItem, NSSDestroyer1<SECItem, SECITEM_FreeItem, PR_TRUE> > | 53 typedef scoped_ptr<SECItem, NSSDestroyer1<SECItem, SECITEM_FreeItem, PR_TRUE> > |
52 ScopedSECItem; | 54 ScopedSECItem; |
53 typedef scoped_ptr<PLArenaPool, | 55 typedef scoped_ptr<PLArenaPool, |
54 NSSDestroyer1<PLArenaPool, PORT_FreeArena, PR_FALSE> > | 56 NSSDestroyer1<PLArenaPool, PORT_FreeArena, PR_FALSE> > |
55 ScopedPLArenaPool; | 57 ScopedPLArenaPool; |
56 | 58 |
57 } // namespace crypto | 59 } // namespace crypto |
58 | 60 |
59 #endif // CRYPTO_SCOPED_NSS_TYPES_H_ | 61 #endif // CRYPTO_SCOPED_NSS_TYPES_H_ |
OLD | NEW |