system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 01:33:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

dssenh: Always duplicate container keys.

Browse source 
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;
}
if (!store_key_container_keys( container ))
{
destroy_key( key );
return FALSE;
}
if (!store_key_container_keys( container )) return FALSE;
*ret_key = (HCRYPTKEY)key;
return TRUE;
@ -494,7 +490,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
HCRYPTKEY *ret_key )
{
struct container *container = (struct container *)hprov;
struct key *key;
struct key *key, *exch_key, *sign_key;
BLOBHEADER *hdr;
DSSPUBKEY *pubkey;
const WCHAR *type;
@ -549,12 +545,24 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
{
case AT_KEYEXCHANGE:
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;
case AT_SIGNATURE:
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;
default:
@ -563,11 +571,7 @@ BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKE
return FALSE;
}
if (!store_key_container_keys( container ))
{
destroy_key( key );
return FALSE;
}
if (!store_key_container_keys( container )) return FALSE;
}
*ret_key = (HCRYPTKEY)key;