diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/scoped_capi_types.h | 4 | ||||
| -rw-r--r-- | crypto/scoped_nss_types.h | 49 |
2 files changed, 24 insertions, 29 deletions
diff --git a/crypto/scoped_capi_types.h b/crypto/scoped_capi_types.h index 16a5192..9ab28d9 100644 --- a/crypto/scoped_capi_types.h +++ b/crypto/scoped_capi_types.h @@ -42,8 +42,8 @@ struct CAPIDestroyerWithFlags { // scoped_ptr-like class for the CryptoAPI cryptography and certificate // handles. Because these handles are defined as integer types, and not -// pointers, the existing scoped classes, such as scoped_ptr_malloc, are -// insufficient. The semantics are the same as scoped_ptr. +// pointers, the existing scoped classes, such as scoped_ptr, are insufficient. +// The semantics are the same as scoped_ptr. template <class CAPIHandle, typename FreeProc> class ScopedCAPIHandle { public: diff --git a/crypto/scoped_nss_types.h b/crypto/scoped_nss_types.h index 21f684f..d5aebc5 100644 --- a/crypto/scoped_nss_types.h +++ b/crypto/scoped_nss_types.h @@ -31,35 +31,30 @@ struct NSSDestroyer1 { }; // Define some convenient scopers around NSS pointers. -typedef scoped_ptr_malloc< - PK11Context, NSSDestroyer1<PK11Context, - PK11_DestroyContext, - PR_TRUE> > ScopedPK11Context; -typedef scoped_ptr_malloc< - PK11SlotInfo, NSSDestroyer<PK11SlotInfo, PK11_FreeSlot> > ScopedPK11Slot; -typedef scoped_ptr_malloc< - PK11SlotList, NSSDestroyer<PK11SlotList, - PK11_FreeSlotList> > ScopedPK11SlotList; -typedef scoped_ptr_malloc< - PK11SymKey, NSSDestroyer<PK11SymKey, PK11_FreeSymKey> > ScopedPK11SymKey; -typedef scoped_ptr_malloc< - SECKEYPublicKey, NSSDestroyer<SECKEYPublicKey, SECKEY_DestroyPublicKey> > +typedef scoped_ptr<PK11Context, + NSSDestroyer1<PK11Context, PK11_DestroyContext, PR_TRUE> > + ScopedPK11Context; +typedef scoped_ptr<PK11SlotInfo, NSSDestroyer<PK11SlotInfo, PK11_FreeSlot> > + ScopedPK11Slot; +typedef scoped_ptr<PK11SlotList, NSSDestroyer<PK11SlotList, PK11_FreeSlotList> > + ScopedPK11SlotList; +typedef scoped_ptr<PK11SymKey, NSSDestroyer<PK11SymKey, PK11_FreeSymKey> > + ScopedPK11SymKey; +typedef scoped_ptr<SECKEYPublicKey, + NSSDestroyer<SECKEYPublicKey, SECKEY_DestroyPublicKey> > ScopedSECKEYPublicKey; -typedef scoped_ptr_malloc< - SECKEYPrivateKey, NSSDestroyer<SECKEYPrivateKey, SECKEY_DestroyPrivateKey> > +typedef scoped_ptr<SECKEYPrivateKey, + NSSDestroyer<SECKEYPrivateKey, SECKEY_DestroyPrivateKey> > ScopedSECKEYPrivateKey; -typedef scoped_ptr_malloc< - SECAlgorithmID, NSSDestroyer1<SECAlgorithmID, - SECOID_DestroyAlgorithmID, - PR_TRUE> > ScopedSECAlgorithmID; -typedef scoped_ptr_malloc< - SECItem, NSSDestroyer1<SECItem, - SECITEM_FreeItem, - PR_TRUE> > ScopedSECItem; -typedef scoped_ptr_malloc< - PLArenaPool, NSSDestroyer1<PLArenaPool, - PORT_FreeArena, - PR_FALSE> > ScopedPLArenaPool; +typedef scoped_ptr<SECAlgorithmID, + NSSDestroyer1<SECAlgorithmID, SECOID_DestroyAlgorithmID, + PR_TRUE> > + ScopedSECAlgorithmID; +typedef scoped_ptr<SECItem, NSSDestroyer1<SECItem, SECITEM_FreeItem, PR_TRUE> > + ScopedSECItem; +typedef scoped_ptr<PLArenaPool, + NSSDestroyer1<PLArenaPool, PORT_FreeArena, PR_FALSE> > + ScopedPLArenaPool; } // namespace crypto |