The branch, master has been updated
via 26ba04a4d19 libcli: smb2: Never print length if
smb2_signing_key_valid() fails for crypto blob.
from a8ec8304917 s4-torture: test file_line_parse as well
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 26ba04a4d1987a859152751e6083d9b9aef770ff
Author: Jeremy Allison <j...@samba.org>
Date: Fri Nov 13 14:18:43 2020 -0800
libcli: smb2: Never print length if smb2_signing_key_valid() fails for
crypto blob.
Blob could be NULL.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14210
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Mon Nov 16 09:47:38 UTC 2020 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
libcli/smb/smb2_signing.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
index 7669b219bbe..6ece5f2e4d3 100644
--- a/libcli/smb/smb2_signing.c
+++ b/libcli/smb/smb2_signing.c
@@ -92,8 +92,7 @@ NTSTATUS smb2_signing_sign_pdu(struct smb2_signing_key
*signing_key,
}
if (!smb2_signing_key_valid(signing_key)) {
- DBG_WARNING("Wrong session key length %zu for SMB2 signing\n",
- signing_key->blob.length);
+ DBG_WARNING("No signing key for SMB2 signing\n");
return NT_STATUS_ACCESS_DENIED;
}
@@ -416,8 +415,7 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key
*encryption_key,
tf = (uint8_t *)vector[0].iov_base;
if (!smb2_signing_key_valid(encryption_key)) {
- DBG_WARNING("Wrong encryption key length %zu for SMB2
signing\n",
- encryption_key->blob.length);
+ DBG_WARNING("No encryption key for SMB2 signing\n");
return NT_STATUS_ACCESS_DENIED;
}
@@ -625,8 +623,7 @@ NTSTATUS smb2_signing_decrypt_pdu(struct smb2_signing_key
*decryption_key,
tf = (uint8_t *)vector[0].iov_base;
if (!smb2_signing_key_valid(decryption_key)) {
- DBG_WARNING("Wrong decryption key length %zu for SMB2
signing\n",
- decryption_key->blob.length);
+ DBG_WARNING("No decryption key for SMB2 signing\n");
return NT_STATUS_ACCESS_DENIED;
}
--
Samba Shared Repository
