|
 |
b6b438 |
From ad4ee458c404dda36480a9c501e1ffb221b35b61 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Tue, 26 Feb 2019 18:11:27 +0100
|
|
|
b6b438 |
Subject: [PATCH 117/187] s3:smbd: Use GnuTLS for AES constants
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
|
|
|
b6b438 |
Adapted to remove Samba AES
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
(cherry picked from commit 33bca1fb8087f7392a8ff0d295a5bdc01f1012e7)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
source3/smbd/smb2_sesssetup.c | 7 ++-----
|
|
|
b6b438 |
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
|
|
|
b6b438 |
index d6900665a95..82ac1182ecc 100644
|
|
|
b6b438 |
--- a/source3/smbd/smb2_sesssetup.c
|
|
|
b6b438 |
+++ b/source3/smbd/smb2_sesssetup.c
|
|
|
b6b438 |
@@ -28,9 +28,6 @@
|
|
|
b6b438 |
#include "../lib/tsocket/tsocket.h"
|
|
|
b6b438 |
#include "../libcli/security/security.h"
|
|
|
b6b438 |
#include "../lib/util/tevent_ntstatus.h"
|
|
|
b6b438 |
-#include "lib/crypto/aes.h"
|
|
|
b6b438 |
-#include "lib/crypto/aes_ccm_128.h"
|
|
|
b6b438 |
-#include "lib/crypto/aes_gcm_128.h"
|
|
|
b6b438 |
|
|
|
b6b438 |
#include "lib/crypto/gnutls_helpers.h"
|
|
|
b6b438 |
#include <gnutls/gnutls.h>
|
|
|
b6b438 |
@@ -443,10 +440,10 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
|
|
|
b6b438 |
sizeof(x->nonce_high_random));
|
|
|
b6b438 |
switch (xconn->smb2.server.cipher) {
|
|
|
b6b438 |
case SMB2_ENCRYPTION_AES128_CCM:
|
|
|
b6b438 |
- nonce_size = AES_CCM_128_NONCE_SIZE;
|
|
|
b6b438 |
+ nonce_size = SMB2_AES_128_CCM_NONCE_SIZE;
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
case SMB2_ENCRYPTION_AES128_GCM:
|
|
|
b6b438 |
- nonce_size = AES_GCM_128_IV_SIZE;
|
|
|
b6b438 |
+ nonce_size = gnutls_cipher_get_iv_size(GNUTLS_CIPHER_AES_128_GCM);
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
default:
|
|
|
b6b438 |
nonce_size = 0;
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|