diff options
| author | Jeremy Allison <jra@samba.org> | 2022-03-07 19:29:57 -0800 |
|---|---|---|
| committer | David Mulder <dmulder@samba.org> | 2022-03-08 22:12:37 +0000 |
| commit | 8dd252ad91bf9ec4b6d993a49eb873f79ca33d28 (patch) | |
| tree | de321e1f970c2ea15db1f26be8c9cabf85fc5887 /libcli | |
| parent | 84a498feeca62f0263e2c536cfd24bf37965ff87 (diff) | |
| download | samba-8dd252ad91bf9ec4b6d993a49eb873f79ca33d28.tar.gz | |
s3: libcli: Rename smb_signing_activate() -> smb1_signing_activate()
Fix the debugs that also used this name.
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: David Mulder <dmulder@samba.org>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/smb/smbXcli_base.c | 2 | ||||
| -rw-r--r-- | libcli/smb/smb_signing.c | 10 | ||||
| -rw-r--r-- | libcli/smb/smb_signing.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index c24613d9374..1da4e4847f8 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -790,7 +790,7 @@ bool smb1cli_conn_activate_signing(struct smbXcli_conn *conn, const DATA_BLOB user_session_key, const DATA_BLOB response) { - return smb_signing_activate(conn->smb1.signing, + return smb1_signing_activate(conn->smb1.signing, user_session_key, response); } diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c index acb2fd5cd06..578eaf8c440 100644 --- a/libcli/smb/smb_signing.c +++ b/libcli/smb/smb_signing.c @@ -371,7 +371,7 @@ bool smb1_signing_check_pdu(struct smb1_signing_state *si, return smb1_signing_good(si, good, seqnum); } -bool smb_signing_activate(struct smb1_signing_state *si, +bool smb1_signing_activate(struct smb1_signing_state *si, const DATA_BLOB user_session_key, const DATA_BLOB response) { @@ -413,19 +413,19 @@ bool smb_signing_activate(struct smb1_signing_state *si, ofs = 0; memcpy(&si->mac_key.data[ofs], user_session_key.data, user_session_key.length); - DEBUG(10, ("smb_signing_activate: user_session_key\n")); + DBG_DEBUG("user_session_key\n"); dump_data(10, user_session_key.data, user_session_key.length); if (response.length) { ofs = user_session_key.length; memcpy(&si->mac_key.data[ofs], response.data, response.length); - DEBUG(10, ("smb_signing_activate: response_data\n")); + DBG_DEBUG("response_data\n"); dump_data(10, response.data, response.length); } else { - DEBUG(10, ("smb_signing_activate: NULL response_data\n")); + DBG_DEBUG("NULL response_data\n"); } - dump_data_pw("smb_signing_activate: mac key is:\n", + dump_data_pw("smb1_signing_activate: mac key is:\n", si->mac_key.data, si->mac_key.length); /* Initialise the sequence number */ diff --git a/libcli/smb/smb_signing.h b/libcli/smb/smb_signing.h index 0b82c209d60..cba6839c3ee 100644 --- a/libcli/smb/smb_signing.h +++ b/libcli/smb/smb_signing.h @@ -42,7 +42,7 @@ NTSTATUS smb1_signing_sign_pdu(struct smb1_signing_state *si, bool smb1_signing_check_pdu(struct smb1_signing_state *si, const uint8_t *inhdr, size_t len, uint32_t seqnum); -bool smb_signing_activate(struct smb1_signing_state *si, +bool smb1_signing_activate(struct smb1_signing_state *si, const DATA_BLOB user_session_key, const DATA_BLOB response); bool smb_signing_is_active(struct smb1_signing_state *si); |