sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-04-24 22:50:23 +03:00
Code

lib:crypto: Change error return to SMB_ASSERT()

Browse Source 
Getting an HMAC too long to fit our array is a programming error. It
should always be 64 bytes exactly.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2022-09-23 16:22:14 +12:00 committed by Andrew Bartlett
parent 01b6c87c4f
commit c52f5ee84b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/crypto/gnutls_aead_aes_256_cbc_hmac_sha512.c
View File

@ -113,6 +113,12 @@ samba_gnutls_aead_aes_256_cbc_hmac_sha512_encrypt(TALLOC_CTX *mem_ctx,
NTSTATUS status; NTSTATUS status;
int rc; int rc;
/*
* We don't want to overflow 'pauth_tag', which is 64 bytes in
* size.
*/
SMB_ASSERT(hmac_size == 64);
if (plaintext->length == 0 || cek->length == 0 || if (plaintext->length == 0 || cek->length == 0 ||
key_salt->length == 0 || mac_salt->length == 0 || iv->length == 0) { key_salt->length == 0 || mac_salt->length == 0 || iv->length == 0) {
return NT_STATUS_INVALID_PARAMETER; return NT_STATUS_INVALID_PARAMETER;
@ -124,14 +130,6 @@ samba_gnutls_aead_aes_256_cbc_hmac_sha512_encrypt(TALLOC_CTX *mem_ctx,
* TODO: Use gnutls_cipher_encrypt3() * TODO: Use gnutls_cipher_encrypt3()
*/ */
if (hmac_size > 64) {
/*
* We don't want to overflow 'pauth_tag', which is 64 bytes in
* size.
*/
return NT_STATUS_INVALID_BUFFER_SIZE;
}
if (plaintext->length + aes_block_size < plaintext->length) { if (plaintext->length + aes_block_size < plaintext->length) {
return NT_STATUS_INVALID_BUFFER_SIZE; return NT_STATUS_INVALID_BUFFER_SIZE;
} }