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: set should_encrypt = true if we got SMB2_SESSION_FLAG_ENCRYPT_DATA

Browse Source 
metze

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Mon Jul 23 20:14:07 CEST 2012 on sn-devel-104
This commit is contained in:
Stefan Metzmacher 2012-07-23 11:38:31 +02:00
parent 6b9321071c
commit 4b64ec546f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libcli/smb/smbXcli_base.c
View File

@ -2427,13 +2427,14 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
state->smb2.should_sign = true;
}
if (cmd == SMB2_OP_SESSSETUP) {
if (cmd == SMB2_OP_SESSSETUP &&
session->smb2.channel_signing_key.length == 0) {
state->smb2.should_encrypt = false;
}
if (state->smb2.should_encrypt) {
state->smb2.should_sign = false;
};
}
}
state->smb2.recv_iov = talloc_zero_array(state, struct iovec, 3);
@ -4382,6 +4383,18 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
session->smb2.should_sign = true;
}
if (session->smb2.session_flags & SMB2_SESSION_FLAG_ENCRYPT_DATA) {
session->smb2.should_encrypt = true;
}
if (conn->protocol < PROTOCOL_SMB2_24) {
session->smb2.should_encrypt = false;
}
if (!(conn->smb2.server.capabilities & SMB2_CAP_ENCRYPTION)) {
session->smb2.should_encrypt = false;
}
generate_random_buffer((uint8_t *)&session->smb2.channel_nonce,
sizeof(session->smb2.channel_nonce));
session->smb2.channel_next = 1;