niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

bcrypt: Factor out wow64 padding conversion.

Browse source
This commit is contained in:
Sven Baars 2023-02-24 19:07:12 +01:00 • committed by Alexandre Julliard
parent c898503e94
commit a554ff21d4
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
dlls/bcrypt/gnutls.c
View file

@ -2302,6 +2302,34 @@ struct key32
} u;
};
union padding
{
BCRYPT_PKCS1_PADDING_INFO pkcs1;
};
union padding32
{
struct
{
PTR32 pszAlgId;
} pkcs1;
};
static union padding *get_padding( union padding32 *padding32, union padding *padding, ULONG flags)
{
if (!padding32) return NULL;
switch (flags)
{
case BCRYPT_PAD_PKCS1:
padding->pkcs1.pszAlgId = ULongToPtr( padding32->pkcs1.pszAlgId );
return padding;
default:
break;
}
return NULL;
}
static struct key *get_symmetric_key( struct key32 *key32, struct key *key )
{
key->hdr = key32->hdr;
@ -2576,12 +2604,12 @@ static NTSTATUS wow64_key_asymmetric_sign( void *args )
NTSTATUS ret;
struct key key;
BCRYPT_PKCS1_PADDING_INFO padding;
union padding padding;
struct key32 *key32 = ULongToPtr( params32->key );
struct key_asymmetric_sign_params params =
{
get_asymmetric_key( key32, &key ),
NULL, /* padding */
get_padding(ULongToPtr( params32->padding ), &padding, params32->flags),
ULongToPtr(params32->input),
params32->input_len,
ULongToPtr(params32->output),
@ -2590,14 +2618,6 @@ static NTSTATUS wow64_key_asymmetric_sign( void *args )
params32->flags
};
if (params32->flags & BCRYPT_PAD_PKCS1)
{
PTR32 *info = ULongToPtr( params32->padding );
if (!info) return STATUS_INVALID_PARAMETER;
padding.pszAlgId = ULongToPtr( *info );
params.padding = &padding;
}
ret = key_asymmetric_sign( &params );
put_asymmetric_key32( &key, key32 );
return ret;
@ -2618,12 +2638,12 @@ static NTSTATUS wow64_key_asymmetric_verify( void *args )
NTSTATUS ret;
struct key key;
BCRYPT_PKCS1_PADDING_INFO padding;
union padding padding;
struct key32 *key32 = ULongToPtr( params32->key );
struct key_asymmetric_verify_params params =
{
get_asymmetric_key( key32, &key ),
NULL, /* padding */
get_padding(ULongToPtr( params32->padding ), &padding, params32->flags),
ULongToPtr(params32->hash),
params32->hash_len,
ULongToPtr(params32->signature),
@ -2631,14 +2651,6 @@ static NTSTATUS wow64_key_asymmetric_verify( void *args )
params32->flags
};
if (params32->flags & BCRYPT_PAD_PKCS1)
{
PTR32 *info = ULongToPtr( params32->padding );
if (!info) return STATUS_INVALID_PARAMETER;
padding.pszAlgId = ULongToPtr( *info );
params.padding = &padding;
}
ret = key_asymmetric_verify( &params );
put_asymmetric_key32( &key, key32 );
return ret;