summaryrefslogtreecommitdiff
path: root/src/core/stdcrypt
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-11-14 23:13:38 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-11-14 23:13:38 +0000
commitbd49c3201234f447a4fc951ea652532d973c07b1 (patch)
tree9ee40ab3181612ff138197c679090577a0c173e8 /src/core/stdcrypt
parent5056234c898e593ba71a01659dbbcd70ca519d89 (diff)
Encryption: gathering all things together, part I
git-svn-id: http://svn.miranda-ng.org/main/trunk@6910 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core/stdcrypt')
-rw-r--r--src/core/stdcrypt/encrypt.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/stdcrypt/encrypt.cpp b/src/core/stdcrypt/encrypt.cpp
index 851bae8450..7414d999f3 100644
--- a/src/core/stdcrypt/encrypt.cpp
+++ b/src/core/stdcrypt/encrypt.cpp
@@ -34,7 +34,7 @@ void CStdCrypt::destroy()
size_t CStdCrypt::getKeyLength()
{
- return m_aes.GetKeyLength();
+ return KEY_LENGTH;
}
bool CStdCrypt::getKey(BYTE *pKey, size_t cbKeyLen)
@@ -65,10 +65,12 @@ int CStdCrypt::setKey(const BYTE *pKey, size_t cbKeyLen)
void CStdCrypt::generateKey(void)
{
LARGE_INTEGER counter;
+ QueryPerformanceCounter(&counter);
+ srand(counter.LowPart);
+
for (int i = 0; i < sizeof(m_key); i++) {
- QueryPerformanceCounter(&counter);
- srand(counter.LowPart);
m_key[i] = (BYTE)rand();
+ Sleep(0);
}
m_aes.MakeKey(m_key, m_password, KEY_LENGTH, BLOCK_SIZE);