32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 230457a6c024e236815b6f9f0351b236044ad515 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Wed, 31 Jul 2019 15:28:34 +0200
|
|
Subject: [PATCH 069/187] s3:smbd: Use generate_nonce_buffer() for AES-CCM and
|
|
AES-GCM nonce
|
|
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
(cherry picked from commit 2b2df6cd398c9cb62989710f9b1642665ec89406)
|
|
---
|
|
source3/smbd/smb2_sesssetup.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
|
|
index 770c22b00f1..591d5c37160 100644
|
|
--- a/source3/smbd/smb2_sesssetup.c
|
|
+++ b/source3/smbd/smb2_sesssetup.c
|
|
@@ -419,8 +419,8 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
|
|
*
|
|
* NOTE: We assume nonces greater than 8 bytes.
|
|
*/
|
|
- generate_random_buffer((uint8_t *)&x->nonce_high_random,
|
|
- sizeof(x->nonce_high_random));
|
|
+ generate_nonce_buffer((uint8_t *)&x->nonce_high_random,
|
|
+ sizeof(x->nonce_high_random));
|
|
switch (xconn->smb2.server.cipher) {
|
|
case SMB2_ENCRYPTION_AES128_CCM:
|
|
nonce_size = AES_CCM_128_NONCE_SIZE;
|
|
--
|
|
2.23.0
|
|
|