From d96e0a3a190d0b3279bc6475844a66d88b8343ee Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 3 Aug 2015 19:18:17 -0400 Subject: [PATCH] Completed cutover to unscoped auto_ptr (which will use Crypto++'s namespace version) --- oaep.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/oaep.cpp b/oaep.cpp index 957c91ed..ad383788 100644 --- a/oaep.cpp +++ b/oaep.cpp @@ -5,8 +5,9 @@ #ifndef CRYPTOPP_IMPORTS #include "cryptlib.h" +#include "stdcpp.h" +#include "smartptr.h" #include "oaep.h" -#include NAMESPACE_BEGIN(CryptoPP) @@ -57,7 +58,7 @@ DecodingResult OAEP_Base::Unpad(const byte *oaepBlock, size_t oaepBlockLen, byte bool invalid = false; using CryptoPP::auto_ptr; - std::auto_ptr pHash(NewHash()); + auto_ptr pHash(NewHash()); // convert from bit length to byte length if (oaepBlockLen % 8 != 0) @@ -77,7 +78,7 @@ DecodingResult OAEP_Base::Unpad(const byte *oaepBlock, size_t oaepBlockLen, byte byte *const maskedDB = t+seedLen; - std::auto_ptr pMGF(NewMGF()); + auto_ptr pMGF(NewMGF()); pMGF->GenerateAndMask(*pHash, maskedSeed, seedLen, maskedDB, dbLen); pMGF->GenerateAndMask(*pHash, maskedDB, dbLen, maskedSeed, seedLen);