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

rsaenh: Fix padding bytes check for 0-byte payload.

This commit is contained in:
Alexandre Julliard 2009-12-02 14:59:56 +01:00
parent b5ca0a9c2a
commit b402b78780
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/crypt32/tests/protectdata.c
View File

@ -213,7 +213,7 @@ static void test_cryptunprotectdata(void)
plain.cbData=0;
}
static void test_simpleroundtrip(const char *plaintext, int wine_fails)
static void test_simpleroundtrip(const char *plaintext)
{
DATA_BLOB input;
DATA_BLOB encrypted;
@ -234,17 +234,9 @@ static void test_simpleroundtrip(const char *plaintext, int wine_fails)
}
res = pCryptUnprotectData(&encrypted, NULL, NULL, NULL, NULL, 0, &output);
if (wine_fails) {
todo_wine
ok(res != 0, "can't unprotect; last error %u\n", GetLastError());
} else {
ok(res != 0, "can't unprotect; last error %u\n", GetLastError());
}
if (res) {
ok(output.cbData == strlen(plaintext), "output wrong length %d for input '%s', wanted %d\n", output.cbData, plaintext, strlen(plaintext));
ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext);
}
ok(res != 0, "can't unprotect; last error %u\n", GetLastError());
ok(output.cbData == strlen(plaintext), "output wrong length %d for input '%s', wanted %d\n", output.cbData, plaintext, strlen(plaintext));
ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext);
}
START_TEST(protectdata)
@ -262,8 +254,8 @@ START_TEST(protectdata)
protected=FALSE;
test_cryptprotectdata();
test_cryptunprotectdata();
test_simpleroundtrip("", 1);
test_simpleroundtrip("hello", 0);
test_simpleroundtrip("");
test_simpleroundtrip("hello");
/* deinit globals here */
if (cipher.pbData) LocalFree(cipher.pbData);

2
dlls/rsaenh/rsaenh.c
View File

@ -2324,7 +2324,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash,
if (Final) {
if (pbData[*pdwDataLen-1] &&
pbData[*pdwDataLen-1] <= pCryptKey->dwBlockLen &&
pbData[*pdwDataLen-1] < *pdwDataLen) {
pbData[*pdwDataLen-1] <= *pdwDataLen) {
BOOL padOkay = TRUE;
/* check that every bad byte has the same value */