diff options
| author | Christopher Bergqvist <chris@digitalpoetry.se> | 2020-06-11 18:02:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 18:02:28 +0200 |
| commit | 0a2c565aa98fa7bc9623a753370e565fc5ed1e63 (patch) | |
| tree | f89c65090af0da4ef3c1915ba797b9a2cda75f9c /src/Common | |
| parent | 8250e83e6188dffd26d6310e36af3132d93412dd (diff) | |
| download | VeraCrypt-0a2c565aa98fa7bc9623a753370e565fc5ed1e63.tar.gz VeraCrypt-0a2c565aa98fa7bc9623a753370e565fc5ed1e63.zip | |
Switch from auto_ptr to unique_ptr (#638)
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/BaseCom.cpp | 4 | ||||
| -rw-r--r-- | src/Common/Dlgcode.c | 2 | ||||
| -rw-r--r-- | src/Common/SecurityToken.cpp | 12 | ||||
| -rw-r--r-- | src/Common/SecurityToken.h | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/Common/BaseCom.cpp b/src/Common/BaseCom.cpp index 7a74e293..32859b11 100644 --- a/src/Common/BaseCom.cpp +++ b/src/Common/BaseCom.cpp @@ -130,7 +130,7 @@ DWORD BaseCom::ReadWriteFile (BOOL write, BOOL device, BSTR filePath, BSTR *buff { try { - auto_ptr <File> file (device ? new Device (filePath, !write) : new File (filePath, !write)); + unique_ptr <File> file (device ? new Device (filePath, !write) : new File (filePath, !write)); file->CheckOpened (SRC_POS); file->SeekAt (offset); @@ -194,7 +194,7 @@ DWORD BaseCom::DeviceIoControl (BOOL readOnly, BOOL device, BSTR filePath, DWORD { try { - auto_ptr <File> file (device ? new Device (filePath, readOnly == TRUE) : new File (filePath, readOnly == TRUE)); + unique_ptr <File> file (device ? new Device (filePath, readOnly == TRUE) : new File (filePath, readOnly == TRUE)); file->CheckOpened (SRC_POS); if (!file->IoCtl (dwIoControlCode, (BYTE *) input, !(BYTE *) input ? 0 : ((DWORD *) ((BYTE *) input))[-1], (BYTE *) *output, !(BYTE *) *output ? 0 : ((DWORD *) ((BYTE *) *output))[-1])) diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index 3c4928e2..17a2f3fd 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -12104,7 +12104,7 @@ BOOL InitSecurityTokenLibrary (HWND hwndDlg) try { - SecurityToken::InitLibrary (SecurityTokenLibraryPath, auto_ptr <GetPinFunctor> (new PinRequestHandler(MainDlg)), auto_ptr <SendExceptionFunctor> (new WarningHandler(MainDlg))); + SecurityToken::InitLibrary (SecurityTokenLibraryPath, unique_ptr <GetPinFunctor> (new PinRequestHandler(MainDlg)), unique_ptr <SendExceptionFunctor> (new WarningHandler(MainDlg))); } catch (Exception &e) { diff --git a/src/Common/SecurityToken.cpp b/src/Common/SecurityToken.cpp index 841ca720..a6759bf8 100644 --- a/src/Common/SecurityToken.cpp +++ b/src/Common/SecurityToken.cpp @@ -513,9 +513,9 @@ namespace VeraCrypt } #ifdef TC_WINDOWS - void SecurityToken::InitLibrary (const wstring &pkcs11LibraryPath, auto_ptr <GetPinFunctor> pinCallback, auto_ptr <SendExceptionFunctor> warningCallback) + void SecurityToken::InitLibrary (const wstring &pkcs11LibraryPath, unique_ptr <GetPinFunctor> pinCallback, unique_ptr <SendExceptionFunctor> warningCallback) #else - void SecurityToken::InitLibrary (const string &pkcs11LibraryPath, auto_ptr <GetPinFunctor> pinCallback, auto_ptr <SendExceptionFunctor> warningCallback) + void SecurityToken::InitLibrary (const string &pkcs11LibraryPath, unique_ptr <GetPinFunctor> pinCallback, unique_ptr <SendExceptionFunctor> warningCallback) #endif { if (Initialized) @@ -548,8 +548,8 @@ namespace VeraCrypt if (status != CKR_OK) throw Pkcs11Exception (status); - PinCallback = pinCallback; - WarningCallback = warningCallback; + PinCallback = std::move(pinCallback); + WarningCallback = std::move(warningCallback); Initialized = true; } @@ -728,8 +728,8 @@ namespace VeraCrypt } #endif // TC_HEADER_Common_Exception - auto_ptr <GetPinFunctor> SecurityToken::PinCallback; - auto_ptr <SendExceptionFunctor> SecurityToken::WarningCallback; + unique_ptr <GetPinFunctor> SecurityToken::PinCallback; + unique_ptr <SendExceptionFunctor> SecurityToken::WarningCallback; bool SecurityToken::Initialized; CK_FUNCTION_LIST_PTR SecurityToken::Pkcs11Functions; diff --git a/src/Common/SecurityToken.h b/src/Common/SecurityToken.h index 1112f11c..6b228895 100644 --- a/src/Common/SecurityToken.h +++ b/src/Common/SecurityToken.h @@ -191,9 +191,9 @@ namespace VeraCrypt static list <SecurityTokenInfo> GetAvailableTokens (); static SecurityTokenInfo GetTokenInfo (CK_SLOT_ID slotId); #ifdef TC_WINDOWS - static void InitLibrary (const wstring &pkcs11LibraryPath, auto_ptr <GetPinFunctor> pinCallback, auto_ptr <SendExceptionFunctor> warningCallback); + static void InitLibrary (const wstring &pkcs11LibraryPath, unique_ptr <GetPinFunctor> pinCallback, unique_ptr <SendExceptionFunctor> warningCallback); #else - static void InitLibrary (const string &pkcs11LibraryPath, auto_ptr <GetPinFunctor> pinCallback, auto_ptr <SendExceptionFunctor> warningCallback); + static void InitLibrary (const string &pkcs11LibraryPath, unique_ptr <GetPinFunctor> pinCallback, unique_ptr <SendExceptionFunctor> warningCallback); #endif static bool IsInitialized () { return Initialized; } static bool IsKeyfilePathValid (const wstring &securityTokenKeyfilePath); @@ -211,7 +211,7 @@ namespace VeraCrypt static void CheckLibraryStatus (); static bool Initialized; - static auto_ptr <GetPinFunctor> PinCallback; + static unique_ptr <GetPinFunctor> PinCallback; static CK_FUNCTION_LIST_PTR Pkcs11Functions; #ifdef TC_WINDOWS static HMODULE Pkcs11LibraryHandle; @@ -219,7 +219,7 @@ namespace VeraCrypt static void *Pkcs11LibraryHandle; #endif static map <CK_SLOT_ID, Pkcs11Session> Sessions; - static auto_ptr <SendExceptionFunctor> WarningCallback; + static unique_ptr <SendExceptionFunctor> WarningCallback; }; } |