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

bcrypt: Fix buffer size query in BCryptExportKey. 

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-06 12:27:11 +02:00 committed by Alexandre Julliard
parent ab0a7d2a1b
commit 7d54f9a87f
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/bcrypt/bcrypt_main.c
View File

@ -968,11 +968,13 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U
*size = req_size; *size = req_size;
if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL;
if (output)
header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; {
header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC;
header->cbKeyData = key->u.s.secret_len; header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1;
memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); header->cbKeyData = key->u.s.secret_len;
memcpy( &header[1], key->u.s.secret, key->u.s.secret_len );
}
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
else if (!wcscmp( type, BCRYPT_OPAQUE_KEY_BLOB )) else if (!wcscmp( type, BCRYPT_OPAQUE_KEY_BLOB ))
@ -981,9 +983,11 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U
*size = req_size; *size = req_size;
if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL;
if (output)
*(ULONG *)output = key->u.s.secret_len; {
memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); *(ULONG *)output = key->u.s.secret_len;
memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len );
}
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) || else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB ) ||
@ -991,8 +995,7 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U
{ {
*size = key->u.a.pubkey_len; *size = key->u.a.pubkey_len;
if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS;
if (output) memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len );
memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len );
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB ))