From bd49c3201234f447a4fc951ea652532d973c07b1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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
---
 src/core/stdcrypt/encrypt.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/core/stdcrypt')

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);
-- 
cgit v1.2.3