From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 11 Nov 2020 14:14:12 +0000 (+0100)
Subject: libcli/smb: replace PROTOCOL_SMB3_10 with PROTOCOL_SMB3_11
X-Git-Tag: samba-4.15.0rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb86d5817377130b5663a4cb09430cb38de2a357;p=thirdparty%2Fsamba.git

libcli/smb: replace PROTOCOL_SMB3_10 with PROTOCOL_SMB3_11

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

diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
index 593bc822007..07cfa39859f 100644
--- a/libcli/smb/smb2_signing.c
+++ b/libcli/smb/smb2_signing.c
@@ -40,7 +40,7 @@ void smb2_signing_derivations_fill_const_stack(struct smb2_signing_derivations *
 {
 	*ds = (struct smb2_signing_derivations) { .signing = NULL, };
 
-	if (protocol >= PROTOCOL_SMB3_10) {
+	if (protocol >= PROTOCOL_SMB3_11) {
 		struct smb2_signing_derivation *d = NULL;
 
 		SMB_ASSERT(preauth_hash.length != 0);
diff --git a/libcli/smb/smb2cli_tcon.c b/libcli/smb/smb2cli_tcon.c
index 8863bae0764..03fb604db5f 100644
--- a/libcli/smb/smb2cli_tcon.c
+++ b/libcli/smb/smb2cli_tcon.c
@@ -76,7 +76,7 @@ struct tevent_req *smb2cli_tcon_send(TALLOC_CTX *mem_ctx,
 
 	fixed = state->fixed;
 	SSVAL(fixed, 0, 9);
-	if (smbXcli_conn_protocol(conn) >= PROTOCOL_SMB3_10) {
+	if (smbXcli_conn_protocol(conn) >= PROTOCOL_SMB3_11) {
 		SSVAL(fixed, 2, flags);
 	} else {
 		SSVAL(fixed, 2, 0); /* Reserved */
@@ -161,7 +161,7 @@ static void smb2cli_tcon_done(struct tevent_req *subreq)
 		return;
 	}
 
-	if (smbXcli_conn_protocol(state->conn) >= PROTOCOL_SMB3_10) {
+	if (smbXcli_conn_protocol(state->conn) >= PROTOCOL_SMB3_11) {
 		tevent_req_done(req);
 		return;
 	}
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 1ca97d73059..74bf04ea605 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -4775,7 +4775,7 @@ static struct tevent_req *smbXcli_negprot_smb2_subreq(struct smbXcli_negprot_sta
 		memset(buf+12, 0, 16);	/* ClientGuid */
 	}
 
-	if (state->conn->max_protocol >= PROTOCOL_SMB3_10) {
+	if (state->conn->max_protocol >= PROTOCOL_SMB3_11) {
 		const struct smb3_encryption_capabilities *client_ciphers =
 			&state->conn->smb2.client.smb3_capabilities.encryption;
 		NTSTATUS status;
@@ -4964,7 +4964,7 @@ static void smbXcli_negprot_smb2_done(struct tevent_req *subreq)
 	}
 
 	conn->smb2.server.security_mode = SVAL(body, 2);
-	if (conn->protocol >= PROTOCOL_SMB3_10) {
+	if (conn->protocol >= PROTOCOL_SMB3_11) {
 		negotiate_context_count = SVAL(body, 6);
 	}
 
@@ -5007,7 +5007,7 @@ static void smbXcli_negprot_smb2_done(struct tevent_req *subreq)
 		conn->smb2.server.sign_algo = SMB2_SIGNING_HMAC_SHA256;
 	}
 
-	if (conn->protocol < PROTOCOL_SMB3_10) {
+	if (conn->protocol < PROTOCOL_SMB3_11) {
 		TALLOC_FREE(subreq);
 
 		if (conn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION) {
@@ -6050,7 +6050,7 @@ NTSTATUS smb2cli_session_update_preauth(struct smbXcli_session *session,
 		return NT_STATUS_INTERNAL_ERROR;
 	}
 
-	if (session->conn->protocol < PROTOCOL_SMB3_10) {
+	if (session->conn->protocol < PROTOCOL_SMB3_11) {
 		return NT_STATUS_OK;
 	}
 
@@ -6130,7 +6130,7 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
 
-	if (conn->protocol >= PROTOCOL_SMB3_10) {
+	if (conn->protocol >= PROTOCOL_SMB3_11) {
 		preauth_hash = data_blob_const(session->smb2_channel.preauth_sha512,
 				sizeof(session->smb2_channel.preauth_sha512));
 	}
@@ -6199,7 +6199,7 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
 		check_signature = true;
 	}
 
-	if (conn->protocol >= PROTOCOL_SMB3_10) {
+	if (conn->protocol >= PROTOCOL_SMB3_11) {
 		check_signature = true;
 	}
 
@@ -6336,7 +6336,7 @@ NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session,
 		return NT_STATUS_INVALID_PARAMETER_MIX;
 	}
 
-	if (conn->protocol >= PROTOCOL_SMB3_10) {
+	if (conn->protocol >= PROTOCOL_SMB3_11) {
 		struct _derivation *d;
 		DATA_BLOB p;