sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3: libcli: Rename smb_key_derivation() -> smb1_key_derivation()

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: David Mulder <dmulder@samba.org>
This commit is contained in:
Jeremy Allison 2022-03-07 19:41:31 -08:00 committed by David Mulder
parent 0b391fc19f
commit 3e021c3762
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcli/smb/smbXcli_base.c
View File

@ -6138,7 +6138,7 @@ NTSTATUS smb1cli_session_protect_session_key(struct smbXcli_session *session)
return NT_STATUS_INVALID_PARAMETER_MIX; return NT_STATUS_INVALID_PARAMETER_MIX;
} }
status = smb_key_derivation(session->smb1.application_key.data, status = smb1_key_derivation(session->smb1.application_key.data,
session->smb1.application_key.length, session->smb1.application_key.length,
session->smb1.application_key.data); session->smb1.application_key.data);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {

2
libcli/smb/smb_signing.c
View File

@ -497,7 +497,7 @@ bool smb1_signing_is_negotiated(struct smb1_signing_state *si)
return si->negotiated; return si->negotiated;
} }
NTSTATUS smb_key_derivation(const uint8_t *KI, NTSTATUS smb1_key_derivation(const uint8_t *KI,
size_t KI_len, size_t KI_len,
uint8_t KO[16]) uint8_t KO[16])
{ {

2
libcli/smb/smb_signing.h
View File

@ -51,7 +51,7 @@ bool smb1_signing_is_mandatory(struct smb1_signing_state *si);
bool smb1_signing_set_negotiated(struct smb1_signing_state *si, bool smb1_signing_set_negotiated(struct smb1_signing_state *si,
bool allowed, bool mandatory); bool allowed, bool mandatory);
bool smb1_signing_is_negotiated(struct smb1_signing_state *si); bool smb1_signing_is_negotiated(struct smb1_signing_state *si);
NTSTATUS smb_key_derivation(const uint8_t *KI, NTSTATUS smb1_key_derivation(const uint8_t *KI,
size_t KI_len, size_t KI_len,
uint8_t KO[16]); uint8_t KO[16]);

4
source3/smbd/reply.c
View File

@ -997,11 +997,11 @@ void reply_tcon_and_X(struct smb_request *req)
if (tcon_flags & TCONX_FLAG_EXTENDED_SIGNATURES) { if (tcon_flags & TCONX_FLAG_EXTENDED_SIGNATURES) {
NTSTATUS status; NTSTATUS status;
status = smb_key_derivation(x->global->application_key_blob.data, status = smb1_key_derivation(x->global->application_key_blob.data,
x->global->application_key_blob.length, x->global->application_key_blob.length,
x->global->application_key_blob.data); x->global->application_key_blob.data);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("smb_key_derivation failed: %s\n", DBG_ERR("smb1_key_derivation failed: %s\n",
nt_errstr(status)); nt_errstr(status));
END_PROFILE(SMBtconX); END_PROFILE(SMBtconX);
return; return;