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: Fix private data size in wow64 thunks.

Browse source
This commit is contained in:
Hans Leidekker 2024-01-22 13:49:37 +01:00 • committed by Alexandre Julliard
parent 28a829a1da
commit 7231d4586d
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/bcrypt/bcrypt_internal.h
View file

@ -184,11 +184,12 @@ struct key_asymmetric
DSSSEED dss_seed; DSSSEED dss_seed;
}; };
#define PRIVATE_DATA_SIZE 3
struct key struct key
{ {
struct object hdr; struct object hdr;
enum alg_id alg_id; enum alg_id alg_id;
UINT64 private[3]; /* private data for backend */ UINT64 private[PRIVATE_DATA_SIZE]; /* private data for backend */
union union
{ {
struct key_symmetric s; struct key_symmetric s;

14
dlls/bcrypt/gnutls.c
View file

@ -2741,7 +2741,7 @@ struct key32
{ {
struct object hdr; struct object hdr;
enum alg_id alg_id; enum alg_id alg_id;
UINT64 private[2]; /* private data for backend */ UINT64 private[PRIVATE_DATA_SIZE]; /* private data for backend */
union union
{ {
struct key_symmetric32 s; struct key_symmetric32 s;
@ -2791,8 +2791,7 @@ static struct key *get_symmetric_key( struct key32 *key32, struct key *key )
{ {
key->hdr = key32->hdr; key->hdr = key32->hdr;
key->alg_id = key32->alg_id; key->alg_id = key32->alg_id;
key->private[0] = key32->private[0]; memcpy( key->private, key32->private, sizeof(key->private) );
key->private[1] = key32->private[1];
key->u.s.mode = key32->u.s.mode; key->u.s.mode = key32->u.s.mode;
key->u.s.block_size = key32->u.s.block_size; key->u.s.block_size = key32->u.s.block_size;
key->u.s.vector = ULongToPtr(key32->u.s.vector); key->u.s.vector = ULongToPtr(key32->u.s.vector);
@ -2806,8 +2805,7 @@ static struct key *get_asymmetric_key( struct key32 *key32, struct key *key )
{ {
key->hdr = key32->hdr; key->hdr = key32->hdr;
key->alg_id = key32->alg_id; key->alg_id = key32->alg_id;
key->private[0] = key32->private[0]; memcpy( key->private, key32->private, sizeof(key->private) );
key->private[1] = key32->private[1];
key->u.a.bitlen = key32->u.a.bitlen; key->u.a.bitlen = key32->u.a.bitlen;
key->u.a.flags = key32->u.a.flags; key->u.a.flags = key32->u.a.flags;
key->u.a.dss_seed = key32->u.a.dss_seed; key->u.a.dss_seed = key32->u.a.dss_seed;
@ -2816,14 +2814,12 @@ static struct key *get_asymmetric_key( struct key32 *key32, struct key *key )
static void put_symmetric_key32( struct key *key, struct key32 *key32 ) static void put_symmetric_key32( struct key *key, struct key32 *key32 )
{ {
key32->private[0] = key->private[0]; memcpy( key32->private, key->private, sizeof(key32->private) );
key32->private[1] = key->private[1];
} }
static void put_asymmetric_key32( struct key *key, struct key32 *key32 ) static void put_asymmetric_key32( struct key *key, struct key32 *key32 )
{ {
key32->private[0] = key->private[0]; memcpy( key32->private, key->private, sizeof(key32->private) );
key32->private[1] = key->private[1];
key32->u.a.flags = key->u.a.flags; key32->u.a.flags = key->u.a.flags;
key32->u.a.dss_seed = key->u.a.dss_seed; key32->u.a.dss_seed = key->u.a.dss_seed;
} }