From 198ddcb18122e922f148c1380d08aec832701c7d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 26 Feb 2019 18:12:57 +0100 Subject: [PATCH 111/187] libcli:smb: Use GnuTLS for AES constants Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett Adapted to remove Samba AES support Signed-off-by: Andrew Bartlett (cherry picked from commit 1b384f378c95f550718ac697271327442e3d09dd) --- libcli/smb/smbXcli_base.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index 5db86720c9c..bfc85ecc225 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -34,9 +34,6 @@ #include "librpc/ndr/libndr.h" #include "libcli/smb/smb2_negotiate_context.h" #include "libcli/smb/smb2_signing.h" -#include "lib/crypto/aes.h" -#include "lib/crypto/aes_ccm_128.h" -#include "lib/crypto/aes_gcm_128.h" #include "lib/crypto/gnutls_helpers.h" #include @@ -6257,10 +6254,10 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session, sizeof(session->smb2->nonce_high_random)); switch (conn->smb2.server.cipher) { case SMB2_ENCRYPTION_AES128_CCM: - nonce_size = AES_CCM_128_NONCE_SIZE; + nonce_size = SMB2_AES_128_CCM_NONCE_SIZE; break; case SMB2_ENCRYPTION_AES128_GCM: - nonce_size = AES_GCM_128_IV_SIZE; + nonce_size = gnutls_cipher_get_iv_size(GNUTLS_CIPHER_AES_128_GCM); break; default: nonce_size = 0; -- 2.23.0