sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

libcli/smb: use SMB 3.10 flags for the transform header

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-10-06 13:33:24 +02:00 committed by Jeremy Allison
parent d021a2d90f
commit 72d3f931d7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcli/smb/smb2_signing.c
View File

@ -214,7 +214,6 @@ NTSTATUS smb2_signing_encrypt_pdu(DATA_BLOB encryption_key,
int count) int count)
{ {
uint8_t *tf; uint8_t *tf;
uint16_t alg;
uint8_t sig[16]; uint8_t sig[16];
int i; int i;
size_t a_total; size_t a_total;
@ -243,8 +242,7 @@ NTSTATUS smb2_signing_encrypt_pdu(DATA_BLOB encryption_key,
m_total += vector[i].iov_len; m_total += vector[i].iov_len;
} }
alg = SMB2_ENCRYPTION_AES128_CCM; SSVAL(tf, SMB2_TF_FLAGS, SMB2_TF_FLAGS_ENCRYPTED);
SSVAL(tf, SMB2_TF_ALGORITHM, alg);
SIVAL(tf, SMB2_TF_MSG_SIZE, m_total); SIVAL(tf, SMB2_TF_MSG_SIZE, m_total);
ZERO_STRUCT(key); ZERO_STRUCT(key);
@ -279,7 +277,7 @@ NTSTATUS smb2_signing_decrypt_pdu(DATA_BLOB decryption_key,
int count) int count)
{ {
uint8_t *tf; uint8_t *tf;
uint16_t alg; uint16_t flags;
uint8_t *sig_ptr = NULL; uint8_t *sig_ptr = NULL;
uint8_t sig[16]; uint8_t sig[16];
int i; int i;
@ -310,10 +308,10 @@ NTSTATUS smb2_signing_decrypt_pdu(DATA_BLOB decryption_key,
m_total += vector[i].iov_len; m_total += vector[i].iov_len;
} }
alg = SVAL(tf, SMB2_TF_ALGORITHM); flags = SVAL(tf, SMB2_TF_FLAGS);
msg_size = IVAL(tf, SMB2_TF_MSG_SIZE); msg_size = IVAL(tf, SMB2_TF_MSG_SIZE);
if (alg != SMB2_ENCRYPTION_AES128_CCM) { if (flags != SMB2_TF_FLAGS_ENCRYPTED) {
return NT_STATUS_ACCESS_DENIED; return NT_STATUS_ACCESS_DENIED;
} }