From 2ad02acf386757b50a957e35bb29a7d34c921e53 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 11 Jun 2019 17:47:33 +0200 Subject: [PATCH] Revert "libcli:smb: Fix signing with multichannel" This reverts commit 1817db965dc0caf55e4308fa4d9203ab4381dc90. This was pushed to fast, the corrected commit follows. Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- libcli/smb/smbXcli_base.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index e916a17e07a..a82146a60f4 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -3282,8 +3282,7 @@ skip_credits: * If it is a channel binding, we already have the main * signing key and try that one. */ - if (signing_key != NULL && - !smb2_signing_key_valid(signing_key)) { + if (!smb2_signing_key_valid(signing_key)) { signing_key = state->session->smb2->signing_key; } @@ -3291,8 +3290,7 @@ skip_credits: * If we do not have any session key yet, we skip the * signing of SMB2_OP_SESSSETUP requests. */ - if (signing_key != NULL && - !smb2_signing_key_valid(signing_key)) { + if (!smb2_signing_key_valid(signing_key)) { signing_key = NULL; } } @@ -3791,14 +3789,12 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn, * we try the main signing key, if it is not * the final response. */ - if (signing_key != NULL && - !smb2_signing_key_valid(signing_key) && + if (!smb2_signing_key_valid(signing_key) && !NT_STATUS_IS_OK(status)) { signing_key = session->smb2->signing_key; } - if (signing_key != NULL && - !smb2_signing_key_valid(signing_key)) { + if (!smb2_signing_key_valid(signing_key)) { /* * If we do not have a session key to * verify the signature, we defer the -- 2.47.3