From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 11 Nov 2020 12:18:24 +0000 (+0100)
Subject: libcli/smb: maintain smbXcli_conn.smb2.server.sign_algo
X-Git-Tag: tevent-0.11.0~1507
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e43962f732ab0006f039a76be3b486f695d4c24;p=thirdparty%2Fsamba.git

libcli/smb: maintain smbXcli_conn.smb2.server.sign_algo

This prepares the negotiation of signing algorithms in future.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14512

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 37ca414d146..5df981104c7 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -127,6 +127,7 @@ struct smbXcli_conn {
 			NTTIME system_time;
 			NTTIME start_time;
 			DATA_BLOB gss_blob;
+			uint16_t sign_algo;
 			uint16_t cipher;
 		} server;
 
@@ -4985,6 +4986,12 @@ static void smbXcli_negprot_smb2_done(struct tevent_req *subreq)
 		return;
 	}
 
+	if (conn->protocol >= PROTOCOL_SMB2_24) {
+		conn->smb2.server.sign_algo = SMB2_SIGNING_AES128_CMAC;
+	} else {
+		conn->smb2.server.sign_algo = SMB2_SIGNING_HMAC_SHA256;
+	}
+
 	if (conn->protocol < PROTOCOL_SMB3_10) {
 		TALLOC_FREE(subreq);