From bd49c3201234f447a4fc951ea652532d973c07b1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Nov 2013 23:13:38 +0000 Subject: Encryption: gathering all things together, part I git-svn-id: http://svn.miranda-ng.org/main/trunk@6910 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Dbx_mmap_SA/src/commonheaders.h | 1 + plugins/Dbx_mmap_SA/src/security.cpp | 29 +++++++++-------------------- 2 files changed, 10 insertions(+), 20 deletions(-) (limited to 'plugins/Dbx_mmap_SA/src') diff --git a/plugins/Dbx_mmap_SA/src/commonheaders.h b/plugins/Dbx_mmap_SA/src/commonheaders.h index 87255bdc18..cfee1a77ae 100644 --- a/plugins/Dbx_mmap_SA/src/commonheaders.h +++ b/plugins/Dbx_mmap_SA/src/commonheaders.h @@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include #include diff --git a/plugins/Dbx_mmap_SA/src/security.cpp b/plugins/Dbx_mmap_SA/src/security.cpp index 04d7c82b49..6d41787d24 100644 --- a/plugins/Dbx_mmap_SA/src/security.cpp +++ b/plugins/Dbx_mmap_SA/src/security.cpp @@ -69,37 +69,27 @@ void CDbxMmapSA::EncodeCopyMemory(void * dst, void * src, size_t size ) { memcpy(dst, src, size); - if (!m_bEncoding) - return; - - CryptoEngine->EncryptMem((BYTE *)dst, (int)size, key); + if (m_bEncoding) + CryptoEngine->EncryptMem((BYTE *)dst, (int)size, key); } void CDbxMmapSA::DecodeCopyMemory(void * dst, void * src, size_t size ) { memcpy(dst, src, size); - if (!m_bEncoding) - return; - - CryptoEngine->DecryptMem((BYTE *)dst, (int)size, key); + if (m_bEncoding) + CryptoEngine->DecryptMem((BYTE *)dst, (int)size, key); } void CDbxMmapSA::EncodeDBWrite(DWORD ofs, void *src, int size) { - if (m_bEncoding) - { - BYTE * buf; - - buf = (BYTE*)GlobalAlloc(GPTR, sizeof(BYTE)*size); + if (m_bEncoding) { + BYTE *buf = (BYTE*)GlobalAlloc(GPTR, sizeof(BYTE)*size); EncodeCopyMemory(buf, src, size); DBWrite(ofs, buf, (int)size); GlobalFree(buf); } - else - { - DBWrite(ofs, src, (int)size); - } + else DBWrite(ofs, src, (int)size); } void CDbxMmapSA::DecodeDBWrite(DWORD ofs, void *src, int size) @@ -242,9 +232,8 @@ void CDbxMmapSA::EncryptDB() return; } - if (SelectEncoder()) { + if (SelectEncoder()) return; - } bEncProcess = 1; @@ -366,4 +355,4 @@ void CDbxMmapSA::ChangePwd() zero_fill((BYTE *)newpass, sizeof newpass); LeaveCriticalSection(&m_csDbAccess); -} \ No newline at end of file +} -- cgit v1.2.3