diff options
| author | Andreas Schneider <asn@samba.org> | 2019-02-26 18:12:57 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-08-21 09:57:31 +0000 |
| commit | 1b384f378c95f550718ac697271327442e3d09dd (patch) | |
| tree | 64e7b9f21bd6432b8e473bc834150fbe629c2e22 /libcli | |
| parent | 43a941f51b2954ffa1a7ab8a9d5c4a18e654b9f6 (diff) | |
| download | samba-1b384f378c95f550718ac697271327442e3d09dd.tar.gz | |
libcli:smb: Use GnuTLS for AES constants
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>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/smb/smbXcli_base.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index fab87be1299..243c247fce3 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 <gnutls/gnutls.h> @@ -6258,10 +6255,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; |