libcli/smb: replace PROTOCOL_SMB2_24 with PROTOCOL_SMB3_00

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 4d74085721abd2d677f1b4f1245df7de8f6d67d8..593bc822007a50f6df91efa2aa4f98cfd10fa3fc 100644 (file)
--- a/libcli/smb/smb2_signing.c
+++ b/libcli/smb/smb2_signing.c
@@ -65,7 +65,7 @@ void smb2_signing_derivations_fill_const_stack(struct smb2_signing_derivations *
                d->label = data_blob_string_const_null("SMBAppKey");
                d->context = preauth_hash;
 
-       } else if (protocol >= PROTOCOL_SMB2_24) {
+       } else if (protocol >= PROTOCOL_SMB3_00) {
                struct smb2_signing_derivation *d = NULL;
 
                d = &ds->__signing;

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index dc97c33cb4438e47b964f28ff9c0965c299cb85f..1ca97d7305953de23e996d0b129672514d32594c 100644 (file)
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -5001,7 +5001,7 @@ static void smbXcli_negprot_smb2_done(struct tevent_req *subreq)
                return;
        }
 
-       if (conn->protocol >= PROTOCOL_SMB2_24) {
+       if (conn->protocol >= PROTOCOL_SMB3_00) {
                conn->smb2.server.sign_algo = SMB2_SIGNING_AES128_CMAC;
        } else {
                conn->smb2.server.sign_algo = SMB2_SIGNING_HMAC_SHA256;
@@ -6226,7 +6226,7 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
                session->smb2->should_encrypt = true;
        }
 
-       if (conn->protocol < PROTOCOL_SMB2_24) {
+       if (conn->protocol < PROTOCOL_SMB3_00) {
                session->smb2->should_encrypt = false;
        }
 
@@ -6346,7 +6346,7 @@ NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session,
                d = &derivation.signing;
                d->label = data_blob_string_const_null("SMBSigningKey");
                d->context = p;
-       } else if (conn->protocol >= PROTOCOL_SMB2_24) {
+       } else if (conn->protocol >= PROTOCOL_SMB3_00) {
                struct _derivation *d;
 
                d = &derivation.signing;
@@ -6367,7 +6367,7 @@ NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session,
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (conn->protocol >= PROTOCOL_SMB2_24) {
+       if (conn->protocol >= PROTOCOL_SMB3_00) {
                struct _derivation *d = &derivation.signing;
 
                status = smb2_key_derivation(channel_key, sizeof(channel_key),
@@ -6404,7 +6404,7 @@ NTSTATUS smb2cli_session_encryption_on(struct smbXcli_session *session)
                return NT_STATUS_OK;
        }
 
-       if (session->conn->protocol < PROTOCOL_SMB2_24) {
+       if (session->conn->protocol < PROTOCOL_SMB3_00) {
                return NT_STATUS_NOT_SUPPORTED;
        }
 
@@ -6421,7 +6421,7 @@ NTSTATUS smb2cli_session_encryption_on(struct smbXcli_session *session)
 
 uint16_t smb2cli_session_get_encryption_cipher(struct smbXcli_session *session)
 {
-       if (session->conn->protocol < PROTOCOL_SMB2_24) {
+       if (session->conn->protocol < PROTOCOL_SMB3_00) {
                return 0;
        }