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

dssenh: Always duplicate container keys. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2020-10-20 10:13:16 +02:00 committed by Alexandre Julliard
parent 04acc70df4
commit a714475655
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/dssenh/main.c
View File

@ -433,11 +433,7 @@ static BOOL generate_key( struct container *container, ALG_ID algid, DWORD bitle
return FALSE; return FALSE;
} }
if (!store_key_container_keys( container )) if (!store_key_container_keys( container )) return FALSE;
{
destroy_key( key );
return FALSE;
}
*ret_key = (HCRYPTKEY)key; *ret_key = (HCRYPTKEY)key;
return TRUE; return TRUE;
@ -494,7 +490,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
HCRYPTKEY *ret_key ) HCRYPTKEY *ret_key )
{ {
struct container *container = (struct container *)hprov; struct container *container = (struct container *)hprov;
struct key *key; struct key *key, *exch_key, *sign_key;
BLOBHEADER *hdr; BLOBHEADER *hdr;
DSSPUBKEY *pubkey; DSSPUBKEY *pubkey;
const WCHAR *type; const WCHAR *type;
@ -549,12 +545,24 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
{ {
case AT_KEYEXCHANGE: case AT_KEYEXCHANGE:
case CALG_DH_SF: case CALG_DH_SF:
container->exch_key = key; if (!(exch_key = duplicate_key( key )))
{
destroy_key( key );
return FALSE;
}
destroy_key( container->exch_key );
container->exch_key = exch_key;
break; break;
case AT_SIGNATURE: case AT_SIGNATURE:
case CALG_DSS_SIGN: case CALG_DSS_SIGN:
container->sign_key = key; if (!(sign_key = duplicate_key( key )))
{
destroy_key( key );
return FALSE;
}
destroy_key( container->sign_key );
container->sign_key = sign_key;
break; break;
default: default:
@ -563,11 +571,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
return FALSE; return FALSE;
} }
if (!store_key_container_keys( container )) if (!store_key_container_keys( container )) return FALSE;
{
destroy_key( key );
return FALSE;
}
} }
*ret_key = (HCRYPTKEY)key; *ret_key = (HCRYPTKEY)key;