cifs: dump the session id and keys also for SMB2 sessions
Subsystems (2)
PATCH 1/1 cifs: dump the session id and keys also for SMB2 sessions
We already dump these keys for SMB3, lets also dump it for SMB2 sessions so that we can use the session key in wireshark to check and validate that the signatures are correct.
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/smb2pdu.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
fs/cifs/smb2pdu.c +15 -0
@@ -1541,6 +1541,21 @@ SMB2_sess_auth_rawntlmssp_authenticate(struct SMB2_sess_data *sess_data) } rc =SMB2_sess_establish_session (sess_data); +#ifdef CONFIG_CIFS_DEBUG_DUMP_KEYS +if (ses->server->dialect <SMB30_PROT_ID ) { +cifs_dbg (VFS ,"%s: dumping generated SMB2 session keys\n" , __func__); +/* +* The session id is opaque in terms of endianness, so we can't +* print it as a long long. we dump it as we got it on the wire +*/ +cifs_dbg (VFS ,"Session Id %*ph\n" , (int )sizeof (ses->Suid), + &ses->Suid); +cifs_dbg (VFS ,"Session Key %*ph\n" , +SMB2_NTLMV2_SESSKEY_SIZE , ses->auth_key.response); +cifs_dbg (VFS ,"Signing Key %*ph\n" , +SMB3_SIGN_KEY_SIZE , ses->auth_key.response); + } +#endif out:kfree (ntlmssp_blob);SMB2_sess_free_buffer (sess_data);
Signature · 1 line
2.13.6
tentatively merged into cifs-2.6.git for-next
Quoted 39 lines · Ronnie Sahlberg
We already dump these keys for SMB3, lets also dump it for SMB2 sessions so that we can use the session key in wireshark to check and validate that the signatures are correct.
Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/smb2pdu.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)fs/cifs/smb2pdu.c +15
-1@@ -1541,6 +1541,21 @@ SMB2_sess_auth_rawntlmssp_authenticate(struct SMB2_sess_data *sess_data) } rc =SMB2_sess_establish_session (sess_data); +#ifdef CONFIG_CIFS_DEBUG_DUMP_KEYS +if (ses->server->dialect <SMB30_PROT_ID ) { +cifs_dbg (VFS ,"%s: dumping generated SMB2 session keys\n" , __func__); +/* +* The session id is opaque in terms of endianness, so we can't +* print it as a long long. we dump it as we got it on the wire +*/ +cifs_dbg (VFS ,"Session Id %*ph\n" , (int )sizeof (ses->Suid), + &ses->Suid); +cifs_dbg (VFS ,"Session Key %*ph\n" , +SMB2_NTLMV2_SESSKEY_SIZE , ses->auth_key.response); +cifs_dbg (VFS ,"Signing Key %*ph\n" , +SMB3_SIGN_KEY_SIZE , ses->auth_key.response); + } +#endif out:kfree (ntlmssp_blob);SMB2_sess_free_buffer (sess_data); --2.13.6
Signature · 3 lines
Thanks, Steve
Quoted 3 lines · Ronnie Sahlberg
We already dump these keys for SMB3, lets also dump it for SMB2 sessions so that we can use the session key in wireshark to check and validate that the signatures are correct.
Sounds useful :)
Reviewed-by Aurelien Aptel <[email protected]>
Cheers,
Signature · 4 lines
Aurélien Aptel / SUSE Labs Samba Team GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)