ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rsaenh: Change the way AES 128 is derived to match Windows behavior.

This commit is contained in:
Bruno Jesus 2014-07-23 00:48:09 -03:00 committed by Alexandre Julliard
parent e55dc35020
commit 453d6dc105
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/rsaenh/rsaenh.c
View File

@ -3926,6 +3926,8 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD
switch (GET_ALG_CLASS(Algid)) switch (GET_ALG_CLASS(Algid))
{ {
case ALG_CLASS_DATA_ENCRYPT: case ALG_CLASS_DATA_ENCRYPT:
{
int need_padding;
*phKey = new_key(hProv, Algid, dwFlags, &pCryptKey); *phKey = new_key(hProv, Algid, dwFlags, &pCryptKey);
if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE;
@ -3937,7 +3939,25 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD
dwLen = RSAENH_MAX_HASH_SIZE; dwLen = RSAENH_MAX_HASH_SIZE;
RSAENH_CPGetHashParam(pCryptHash->hProv, hBaseData, HP_HASHVAL, abHashValue, &dwLen, 0); RSAENH_CPGetHashParam(pCryptHash->hProv, hBaseData, HP_HASHVAL, abHashValue, &dwLen, 0);
if (dwLen < pCryptKey->dwKeyLen) { /*
* The usage of padding seems to vary from algorithm to algorithm.
* For now the only different case found was for AES with 128 bit key.
*/
switch(Algid)
{
case CALG_AES_128:
/* To reduce the chance of regressions we will only deviate
* from the old behavior for the tested hash lengths */
if (dwLen == 16 || dwLen == 20)
{
need_padding = 1;
break;
}
default:
need_padding = dwLen < pCryptKey->dwKeyLen;
}
if (need_padding) {
BYTE pad1[RSAENH_HMAC_DEF_PAD_LEN], pad2[RSAENH_HMAC_DEF_PAD_LEN]; BYTE pad1[RSAENH_HMAC_DEF_PAD_LEN], pad2[RSAENH_HMAC_DEF_PAD_LEN];
BYTE old_hashval[RSAENH_MAX_HASH_SIZE]; BYTE old_hashval[RSAENH_MAX_HASH_SIZE];
DWORD i; DWORD i;
@ -3966,7 +3986,7 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD
memcpy(pCryptKey->abKeyValue, abHashValue, memcpy(pCryptKey->abKeyValue, abHashValue,
RSAENH_MIN(pCryptKey->dwKeyLen, sizeof(pCryptKey->abKeyValue))); RSAENH_MIN(pCryptKey->dwKeyLen, sizeof(pCryptKey->abKeyValue)));
break; break;
}
case ALG_CLASS_MSG_ENCRYPT: case ALG_CLASS_MSG_ENCRYPT:
if (!lookup_handle(&handle_table, pCryptHash->hKey, RSAENH_MAGIC_KEY, if (!lookup_handle(&handle_table, pCryptHash->hKey, RSAENH_MAGIC_KEY,
(OBJECTHDR**)&pMasterKey)) (OBJECTHDR**)&pMasterKey))

5
dlls/rsaenh/tests/rsaenh.c
View File

@ -1140,9 +1140,6 @@ static void test_aes(int keylen)
result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData));
ok(result, "Expected OK, got last error %d\n", GetLastError()); ok(result, "Expected OK, got last error %d\n", GetLastError());
ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen);
if(i == 0) todo_wine
ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n");
else
ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n");
result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen);
@ -3530,9 +3527,7 @@ static void test_key_derivation(const char *prov)
memset(wine_broken, 0, sizeof(wine_broken)); memset(wine_broken, 0, sizeof(wine_broken));
wine_broken[8].mode = wine_broken[8].blen = 1; wine_broken[8].mode = wine_broken[8].blen = 1;
wine_broken[9].exp_data = 1;
wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8];
wine_broken[21] = wine_broken[33] = wine_broken[45] = wine_broken[9];
for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++)
{ {