|
 |
b6b438 |
From de4a182c0fab70125cd7e572a8f913c2f686f827 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Thu, 14 Mar 2019 09:26:04 +0100
|
|
|
b6b438 |
Subject: [PATCH 112/187] libcli:smb: Add gnutls_aead_cipher_hd_t to
|
|
|
b6b438 |
smb2_signing_key structure
|
|
|
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 support
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
(cherry picked from commit 37dc63e8afab8e1f88dc8a4b77c6ef3337933eb1)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
libcli/smb/smb2_signing.c | 5 +++++
|
|
|
b6b438 |
libcli/smb/smb2_signing.h | 3 +++
|
|
|
b6b438 |
2 files changed, 8 insertions(+)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
index 2f9bae4ba8e..01027d55fbe 100644
|
|
|
b6b438 |
--- a/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
+++ b/libcli/smb/smb2_signing.c
|
|
|
b6b438 |
@@ -35,6 +35,11 @@ int smb2_signing_key_destructor(struct smb2_signing_key *key)
|
|
|
b6b438 |
key->hmac_hnd = NULL;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
+ if (key->cipher_hnd != NULL) {
|
|
|
b6b438 |
+ gnutls_aead_cipher_deinit(key->cipher_hnd);
|
|
|
b6b438 |
+ key->cipher_hnd = NULL;
|
|
|
b6b438 |
+ }
|
|
|
b6b438 |
+
|
|
|
b6b438 |
return 0;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/libcli/smb/smb2_signing.h b/libcli/smb/smb2_signing.h
|
|
|
b6b438 |
index 96a002f4a0c..13fb54e4e4e 100644
|
|
|
b6b438 |
--- a/libcli/smb/smb2_signing.h
|
|
|
b6b438 |
+++ b/libcli/smb/smb2_signing.h
|
|
|
b6b438 |
@@ -25,9 +25,12 @@ struct iovec;
|
|
|
b6b438 |
/* Forward declaration of GnuTLS typedefs */
|
|
|
b6b438 |
struct hmac_hd_st;
|
|
|
b6b438 |
typedef struct hmac_hd_st* gnutls_hmac_hd_t;
|
|
|
b6b438 |
+struct api_aead_cipher_hd_st;
|
|
|
b6b438 |
+typedef struct api_aead_cipher_hd_st *gnutls_aead_cipher_hd_t;
|
|
|
b6b438 |
|
|
|
b6b438 |
struct smb2_signing_key {
|
|
|
b6b438 |
gnutls_hmac_hd_t hmac_hnd;
|
|
|
b6b438 |
+ gnutls_aead_cipher_hd_t cipher_hnd;
|
|
|
b6b438 |
DATA_BLOB blob;
|
|
|
b6b438 |
};
|
|
|
b6b438 |
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|