Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 11:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSAENH] Sync with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=67392
This commit is contained in:
Amine Khaldi 2015-04-25 10:51:25 +00:00
parent c92559c27c
commit ae20e73806
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/rsaenh/rsaenh.c
View file

@ -3466,6 +3466,8 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam
switch (pCryptKey->aiAlgid) {
case CALG_RC2:
case CALG_RC4:
{
KEYCONTAINER *pKeyContainer = get_key_container(pCryptKey->hProv);
if (!pbData)
{
SetLastError(ERROR_INVALID_PARAMETER);
@ -3478,11 +3480,13 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam
pbData, 11);
pCryptKey->dwSaltLen = 11;
setup_key(pCryptKey);
/* Strange but true: salt length reset to 0 after setting
* it via KP_SALT.
*/
pCryptKey->dwSaltLen = 0;
/* After setting the salt value if the provider is not base or
* strong the salt length will be reset. */
if (pKeyContainer->dwPersonality != RSAENH_PERSONALITY_BASE &&
pKeyContainer->dwPersonality != RSAENH_PERSONALITY_STRONG)
pCryptKey->dwSaltLen = 0;
break;
}
default:
SetLastError(NTE_BAD_KEY);
return FALSE;

2
reactos/media/doc/README.WINE
View file

@ -168,7 +168,7 @@ reactos/dll/win32/riched20 # Synced to WineStaging-1.7.37
reactos/dll/win32/riched32 # Synced to Wine-1.7.27
reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17
reactos/dll/win32/rsabase # Synced to Wine-1.7.27
reactos/dll/win32/rsaenh # Synced to Wine-1.7.27
reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.37
reactos/dll/win32/sccbase # Synced to Wine-1.7.27
reactos/dll/win32/schannel # Synced to Wine-1.7.27
reactos/dll/win32/scrrun # Synced to Wine-1.7.27