diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-10-07 09:54:35 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-10-16 19:30:04 +0200 |
| commit | eef76b9cb3695c69487176c3ec84acab368fa725 (patch) | |
| tree | 32278ff6e1783596f395b8a1b506d2621814a789 /source3/smbd/smb2_server.c | |
| parent | 1ed30a6ba7beab8cd3a4a1cfce3724cdc61dbcab (diff) | |
| download | samba-eef76b9cb3695c69487176c3ec84acab368fa725.tar.gz | |
s3:smb2_server: pass xconn->smb2.server.cipher to smb2_signing_[de|en]ncrypt_pdu()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd/smb2_server.c')
| -rw-r--r-- | source3/smbd/smb2_server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 0150d0c3f46..689bfd7561d 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -400,7 +400,7 @@ static NTSTATUS smbd_smb2_inbuf_parse_compound(struct smbXsrv_connection *xconn, tf_iov[1].iov_len = enc_len; status = smb2_signing_decrypt_pdu(s->global->decryption_key, - xconn->protocol, + xconn->smb2.server.cipher, tf_iov, 2); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(iov_alloc); @@ -1250,7 +1250,7 @@ static NTSTATUS smb2_send_async_interim_response(const struct smbd_smb2_request */ if (firsttf->iov_len == SMB2_TF_HDR_SIZE) { status = smb2_signing_encrypt_pdu(req->first_key, - xconn->protocol, + xconn->smb2.server.cipher, firsttf, nreq->out.vector_count - first_idx); if (!NT_STATUS_IS_OK(status)) { @@ -1591,7 +1591,7 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev, DATA_BLOB encryption_key = x->global->encryption_key; status = smb2_signing_encrypt_pdu(encryption_key, - xconn->protocol, + xconn->smb2.server.cipher, &state->vector[1+SMBD_SMB2_TF_IOV_OFS], SMBD_SMB2_NUM_IOV_PER_REQ); if (!NT_STATUS_IS_OK(status)) { @@ -2494,7 +2494,7 @@ static NTSTATUS smbd_smb2_request_reply(struct smbd_smb2_request *req) */ if (firsttf->iov_len == SMB2_TF_HDR_SIZE) { status = smb2_signing_encrypt_pdu(req->first_key, - xconn->protocol, + xconn->smb2.server.cipher, firsttf, req->out.vector_count - first_idx); if (!NT_STATUS_IS_OK(status)) { @@ -2848,7 +2848,7 @@ static NTSTATUS smbd_smb2_send_break(struct smbXsrv_connection *xconn, DATA_BLOB encryption_key = session->global->encryption_key; status = smb2_signing_encrypt_pdu(encryption_key, - xconn->protocol, + xconn->smb2.server.cipher, &state->vector[1+SMBD_SMB2_TF_IOV_OFS], SMBD_SMB2_NUM_IOV_PER_REQ); if (!NT_STATUS_IS_OK(status)) { |