sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

libcli:smb: Use GnuTLS for AES constants

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Adapted to remove Samba AES support

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2019-02-26 18:12:57 +01:00 committed by Andreas Schneider
parent 43a941f51b
commit 1b384f378c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libcli/smb/smbXcli_base.c
View File

@ -34,9 +34,6 @@
#include "librpc/ndr/libndr.h" #include "librpc/ndr/libndr.h"
#include "libcli/smb/smb2_negotiate_context.h" #include "libcli/smb/smb2_negotiate_context.h"
#include "libcli/smb/smb2_signing.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 "lib/crypto/gnutls_helpers.h"
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
@ -6258,10 +6255,10 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
sizeof(session->smb2->nonce_high_random)); sizeof(session->smb2->nonce_high_random));
switch (conn->smb2.server.cipher) { switch (conn->smb2.server.cipher) {
case SMB2_ENCRYPTION_AES128_CCM: case SMB2_ENCRYPTION_AES128_CCM:
nonce_size = AES_CCM_128_NONCE_SIZE; nonce_size = SMB2_AES_128_CCM_NONCE_SIZE;
break; break;
case SMB2_ENCRYPTION_AES128_GCM: 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; break;
default: default:
nonce_size = 0; nonce_size = 0;