mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
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>
This commit is contained in:
parent
84a498feec
commit
8dd252ad91
@ -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);
|
||||
}
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
@ -310,7 +310,7 @@ void srv_set_signing(struct smbXsrv_connection *conn,
|
||||
return;
|
||||
}
|
||||
|
||||
if (!smb_signing_activate(conn->smb1.signing_state,
|
||||
if (!smb1_signing_activate(conn->smb1.signing_state,
|
||||
user_session_key, response)) {
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user