summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-02-27 08:48:55 +0100
committerStefan Metzmacher <metze@samba.org>2012-02-27 12:51:33 +0100
commitaa4331be9e6e3db3bd14c9abd024e95f6aec8bdb (patch)
tree7468dba78b8dd1167eb2938bcad2969a427aacf2 /source3/libsmb
parentb93f6ac79c431e4effb3905824bcaef5cbe5e85a (diff)
downloadsamba-aa4331be9e6e3db3bd14c9abd024e95f6aec8bdb.tar.gz
samba-aa4331be9e6e3db3bd14c9abd024e95f6aec8bdb.tar.bz2
samba-aa4331be9e6e3db3bd14c9abd024e95f6aec8bdb.zip
libcli/smb/smbXcli: maintain smb2 channel_signing_key separate from the signing_key
The signing_key is fix across all channels and is used for session setups on a channel binding. Note: - the last session setup response is signed with the new channel signing key. - the reauth session setups are signed with the channel signing key. It's also not needed to remember the main session key. metze
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/cliconnect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 146fc3d3b4..79b9496f8b 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1519,7 +1519,7 @@ static void cli_session_setup_kerberos_done(struct tevent_req *subreq)
if (cli_state_protocol(state->cli) >= PROTOCOL_SMB2_02) {
struct smbXcli_session *session = state->cli->smb2.session;
- status = smb2cli_session_update_session_key(session,
+ status = smb2cli_session_set_session_key(session,
state->session_key_krb5,
recv_iov);
if (tevent_req_nterror(req, status)) {
@@ -1710,7 +1710,7 @@ static void cli_session_setup_ntlmssp_done(struct tevent_req *subreq)
if (cli_state_protocol(state->cli) >= PROTOCOL_SMB2_02) {
struct smbXcli_session *session = state->cli->smb2.session;
- status = smb2cli_session_update_session_key(session,
+ status = smb2cli_session_set_session_key(session,
state->ntlmssp_state->session_key,
recv_iov);
if (tevent_req_nterror(req, status)) {