From: Ralph Boehme Date: Sat, 19 Jul 2025 13:43:03 +0000 (+0200) Subject: libcli/smb: also dump signing_algo in smbXcli_session_dump_keys() X-Git-Tag: tdb-1.4.14~99 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=421e016c4ea53a58b7f1badc401c400322d86bb5;p=thirdparty%2Fsamba.git libcli/smb: also dump signing_algo in smbXcli_session_dump_keys() The server side already does that and I'm aiming for consolidating server and client code for dumping the keys. Signed-off-by: Ralph Boehme Reviewed-by: Volker Lendecke --- diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index f6f60a1f78f..dd1fdb38a5f 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -7602,6 +7602,7 @@ NTSTATUS smb2cli_parse_dyn_buffer(uint32_t dyn_offset, void smbXcli_session_dump_keys(uint64_t session_id, DATA_BLOB *session_key, + uint16_t signing_algo, DATA_BLOB *signing_key, DATA_BLOB *application_key, DATA_BLOB *encryption_key, @@ -7612,6 +7613,7 @@ void smbXcli_session_dump_keys(uint64_t session_id, dump_data(0, (uint8_t*)&session_id, sizeof(session_id)); DEBUGADD(0, ("Session Key ")); dump_data(0, session_key->data, session_key->length); + DEBUGADD(0, ("Signing Algo: %u\n", signing_algo)); DEBUGADD(0, ("Signing Key ")); dump_data(0, signing_key->data, signing_key->length); DEBUGADD(0, ("App Key ")); diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index fb486a69ddf..f6e1332822f 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -532,6 +532,7 @@ bool smbXcli_session_is_guest(struct smbXcli_session *session); bool smbXcli_session_is_authenticated(struct smbXcli_session *session); void smbXcli_session_dump_keys(uint64_t session_id, DATA_BLOB *session_key, + uint16_t signing_algo, DATA_BLOB *signing_key, DATA_BLOB *application_key, DATA_BLOB *encryption_key, diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index c24f39aee13..13ee5bb905a 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1084,6 +1084,7 @@ static void cli_session_setup_gensec_ready(struct tevent_req *req) smbXcli_session_dump_keys(smb2cli_session_current_id(session), &state->session_key, + smb2cli_conn_server_signing_algo(state->cli->conn), &sig, &app, &enc,