|
 |
1524bc |
From 5076ca90caf92b56a5708cf185835e74ddfe3cfb Mon Sep 17 00:00:00 2001
|
|
|
1524bc |
From: Andreas Schneider <asn@samba.org>
|
|
|
1524bc |
Date: Thu, 14 Mar 2019 09:34:23 +0100
|
|
|
1524bc |
Subject: [PATCH 113/187] libcli:smb: Use a smb2_signing_key for storing the
|
|
|
1524bc |
encryption key
|
|
|
1524bc |
|
|
|
1524bc |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
1524bc |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
1524bc |
(cherry picked from commit 48116a30d51d9bac6201a8b94262aa78b451ad63)
|
|
|
1524bc |
---
|
|
|
1524bc |
libcli/smb/smbXcli_base.c | 29 +++++++++++++++++++----------
|
|
|
1524bc |
1 file changed, 19 insertions(+), 10 deletions(-)
|
|
|
1524bc |
|
|
|
1524bc |
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
|
|
|
1524bc |
index bfc85ecc225..52bc438c389 100644
|
|
|
1524bc |
--- a/libcli/smb/smbXcli_base.c
|
|
|
1524bc |
+++ b/libcli/smb/smbXcli_base.c
|
|
|
1524bc |
@@ -154,7 +154,7 @@ struct smb2cli_session {
|
|
|
1524bc |
struct smb2_signing_key *signing_key;
|
|
|
1524bc |
bool should_sign;
|
|
|
1524bc |
bool should_encrypt;
|
|
|
1524bc |
- DATA_BLOB encryption_key;
|
|
|
1524bc |
+ struct smb2_signing_key *encryption_key;
|
|
|
1524bc |
DATA_BLOB decryption_key;
|
|
|
1524bc |
uint64_t nonce_high_random;
|
|
|
1524bc |
uint64_t nonce_high_max;
|
|
|
1524bc |
@@ -3090,7 +3090,7 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
|
|
|
1524bc |
struct iovec *iov;
|
|
|
1524bc |
int i, num_iov, nbt_len;
|
|
|
1524bc |
int tf_iov = -1;
|
|
|
1524bc |
- const DATA_BLOB *encryption_key = NULL;
|
|
|
1524bc |
+ const struct smb2_signing_key *encryption_key = NULL;
|
|
|
1524bc |
uint64_t encryption_session_id = 0;
|
|
|
1524bc |
uint64_t nonce_high = UINT64_MAX;
|
|
|
1524bc |
uint64_t nonce_low = UINT64_MAX;
|
|
|
1524bc |
@@ -3137,8 +3137,8 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
|
|
|
1524bc |
continue;
|
|
|
1524bc |
}
|
|
|
1524bc |
|
|
|
1524bc |
- encryption_key = &state->session->smb2->encryption_key;
|
|
|
1524bc |
- if (encryption_key->length == 0) {
|
|
|
1524bc |
+ encryption_key = state->session->smb2->encryption_key;
|
|
|
1524bc |
+ if (!smb2_signing_key_valid(encryption_key)) {
|
|
|
1524bc |
return NT_STATUS_INVALID_PARAMETER_MIX;
|
|
|
1524bc |
}
|
|
|
1524bc |
|
|
|
1524bc |
@@ -3379,7 +3379,7 @@ skip_credits:
|
|
|
1524bc |
buf += v->iov_len;
|
|
|
1524bc |
}
|
|
|
1524bc |
|
|
|
1524bc |
- status = smb2_signing_encrypt_pdu(*encryption_key,
|
|
|
1524bc |
+ status = smb2_signing_encrypt_pdu(encryption_key->blob,
|
|
|
1524bc |
state->conn->smb2.server.cipher,
|
|
|
1524bc |
&iov[tf_iov], num_iov - tf_iov);
|
|
|
1524bc |
if (!NT_STATUS_IS_OK(status)) {
|
|
|
1524bc |
@@ -5723,11 +5723,11 @@ NTSTATUS smb2cli_session_encryption_key(struct smbXcli_session *session,
|
|
|
1524bc |
return NT_STATUS_NO_USER_SESSION_KEY;
|
|
|
1524bc |
}
|
|
|
1524bc |
|
|
|
1524bc |
- if (session->smb2->encryption_key.length == 0) {
|
|
|
1524bc |
+ if (!smb2_signing_key_valid(session->smb2->encryption_key)) {
|
|
|
1524bc |
return NT_STATUS_NO_USER_SESSION_KEY;
|
|
|
1524bc |
}
|
|
|
1524bc |
|
|
|
1524bc |
- *key = data_blob_dup_talloc(mem_ctx, session->smb2->encryption_key);
|
|
|
1524bc |
+ *key = data_blob_dup_talloc(mem_ctx, session->smb2->encryption_key->blob);
|
|
|
1524bc |
if (key->data == NULL) {
|
|
|
1524bc |
return NT_STATUS_NO_MEMORY;
|
|
|
1524bc |
}
|
|
|
1524bc |
@@ -6121,9 +6121,18 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
|
|
|
1524bc |
}
|
|
|
1524bc |
|
|
|
1524bc |
session->smb2->encryption_key =
|
|
|
1524bc |
- data_blob_dup_talloc(session,
|
|
|
1524bc |
+ talloc_zero(session, struct smb2_signing_key);
|
|
|
1524bc |
+ if (session->smb2->encryption_key == NULL) {
|
|
|
1524bc |
+ ZERO_STRUCT(session_key);
|
|
|
1524bc |
+ return NT_STATUS_NO_MEMORY;
|
|
|
1524bc |
+ }
|
|
|
1524bc |
+ talloc_set_destructor(session->smb2->encryption_key,
|
|
|
1524bc |
+ smb2_signing_key_destructor);
|
|
|
1524bc |
+
|
|
|
1524bc |
+ session->smb2->encryption_key->blob =
|
|
|
1524bc |
+ data_blob_dup_talloc(session->smb2->encryption_key,
|
|
|
1524bc |
session->smb2->signing_key->blob);
|
|
|
1524bc |
- if (session->smb2->encryption_key.data == NULL) {
|
|
|
1524bc |
+ if (!smb2_signing_key_valid(session->smb2->encryption_key)) {
|
|
|
1524bc |
ZERO_STRUCT(session_key);
|
|
|
1524bc |
return NT_STATUS_NO_MEMORY;
|
|
|
1524bc |
}
|
|
|
1524bc |
@@ -6134,7 +6143,7 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session,
|
|
|
1524bc |
status = smb2_key_derivation(session_key, sizeof(session_key),
|
|
|
1524bc |
d->label.data, d->label.length,
|
|
|
1524bc |
d->context.data, d->context.length,
|
|
|
1524bc |
- session->smb2->encryption_key.data);
|
|
|
1524bc |
+ session->smb2->encryption_key->blob.data);
|
|
|
1524bc |
if (!NT_STATUS_IS_OK(status)) {
|
|
|
1524bc |
return status;
|
|
|
1524bc |
}
|
|
|
1524bc |
--
|
|
|
1524bc |
2.23.0
|
|
|
1524bc |
|