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

rsaenh: Check pad bytes for consistency when decrypting.

Browse Source
This commit is contained in:
Juan Lang 2007-11-11 12:33:09 -08:00 committed by Alexandre Julliard
parent cb113b23c4
commit f6833c4d09
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/rsaenh/rsaenh.c
View File

@ -2127,13 +2127,25 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash,
if (Final) { if (Final) {
if (pbData[*pdwDataLen-1] && if (pbData[*pdwDataLen-1] &&
pbData[*pdwDataLen-1] <= pCryptKey->dwBlockLen && 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 */
for (i = 1; padOkay && i < pbData[*pdwDataLen-1]; i++)
if (pbData[*pdwDataLen - i - 1] != pbData[*pdwDataLen - 1])
padOkay = FALSE;
if (padOkay)
*pdwDataLen -= pbData[*pdwDataLen-1]; *pdwDataLen -= pbData[*pdwDataLen-1];
else { else {
SetLastError(NTE_BAD_DATA); SetLastError(NTE_BAD_DATA);
return FALSE; return FALSE;
} }
} }
else {
SetLastError(NTE_BAD_DATA);
return FALSE;
}
}
} else if (GET_ALG_TYPE(pCryptKey->aiAlgid) == ALG_TYPE_STREAM) { } else if (GET_ALG_TYPE(pCryptKey->aiAlgid) == ALG_TYPE_STREAM) {
encrypt_stream_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbData, *pdwDataLen); encrypt_stream_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbData, *pdwDataLen);