|
 |
b6b438 |
From 63820f4d509c10993de827bc99115f57151e8ef4 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Date: Thu, 14 Nov 2019 11:16:09 +1300
|
|
|
b6b438 |
Subject: [PATCH 155/187] libcli:auth Check return code of
|
|
|
b6b438 |
netlogon_creds_aes_encrypt()
|
|
|
b6b438 |
|
|
|
b6b438 |
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14195
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
|
|
|
b6b438 |
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
|
|
|
b6b438 |
Autobuild-Date(master): Thu Nov 14 09:25:36 UTC 2019 on sn-devel-184
|
|
|
b6b438 |
|
|
|
b6b438 |
(cherry picked from commit 0361a26e395723296899c3d48cff86d532372710)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
libcli/auth/credentials.c | 8 +++++++-
|
|
|
b6b438 |
libcli/auth/netlogon_creds_cli.c | 20 ++++++++++++++------
|
|
|
b6b438 |
2 files changed, 21 insertions(+), 7 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/libcli/auth/credentials.c b/libcli/auth/credentials.c
|
|
|
b6b438 |
index c78f2012bf2..f1088a1d8e0 100644
|
|
|
b6b438 |
--- a/libcli/auth/credentials.c
|
|
|
b6b438 |
+++ b/libcli/auth/credentials.c
|
|
|
b6b438 |
@@ -37,10 +37,16 @@ static NTSTATUS netlogon_creds_step_crypt(struct netlogon_creds_CredentialState
|
|
|
b6b438 |
const struct netr_Credential *in,
|
|
|
b6b438 |
struct netr_Credential *out)
|
|
|
b6b438 |
{
|
|
|
b6b438 |
+ NTSTATUS status;
|
|
|
b6b438 |
if (creds->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
|
|
|
b6b438 |
memcpy(out->data, in->data, sizeof(out->data));
|
|
|
b6b438 |
|
|
|
b6b438 |
- netlogon_creds_aes_encrypt(creds, out->data, sizeof(out->data));
|
|
|
b6b438 |
+ status = netlogon_creds_aes_encrypt(creds,
|
|
|
b6b438 |
+ out->data,
|
|
|
b6b438 |
+ sizeof(out->data));
|
|
|
b6b438 |
+ if (!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
+ return status;
|
|
|
b6b438 |
+ }
|
|
|
b6b438 |
} else {
|
|
|
b6b438 |
des_crypt112(out->data, in->data, creds->session_key, 1);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c
|
|
|
b6b438 |
index 2123862dbd2..0378f302ffa 100644
|
|
|
b6b438 |
--- a/libcli/auth/netlogon_creds_cli.c
|
|
|
b6b438 |
+++ b/libcli/auth/netlogon_creds_cli.c
|
|
|
b6b438 |
@@ -1995,9 +1995,13 @@ static void netlogon_creds_cli_ServerPasswordSet_locked(struct tevent_req *subre
|
|
|
b6b438 |
if (state->tmp_creds.negotiate_flags & NETLOGON_NEG_PASSWORD_SET2) {
|
|
|
b6b438 |
|
|
|
b6b438 |
if (state->tmp_creds.negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
|
|
|
b6b438 |
- netlogon_creds_aes_encrypt(&state->tmp_creds,
|
|
|
b6b438 |
- state->samr_crypt_password.data,
|
|
|
b6b438 |
- 516);
|
|
|
b6b438 |
+ status = netlogon_creds_aes_encrypt(&state->tmp_creds,
|
|
|
b6b438 |
+ state->samr_crypt_password.data,
|
|
|
b6b438 |
+ 516);
|
|
|
b6b438 |
+ if (tevent_req_nterror(req, status)) {
|
|
|
b6b438 |
+ netlogon_creds_cli_ServerPasswordSet_cleanup(req, status);
|
|
|
b6b438 |
+ return;
|
|
|
b6b438 |
+ }
|
|
|
b6b438 |
} else {
|
|
|
b6b438 |
status = netlogon_creds_arcfour_crypt(&state->tmp_creds,
|
|
|
b6b438 |
state->samr_crypt_password.data,
|
|
|
b6b438 |
@@ -3708,9 +3712,13 @@ static void netlogon_creds_cli_SendToSam_locked(struct tevent_req *subreq)
|
|
|
b6b438 |
ZERO_STRUCT(state->rep_auth);
|
|
|
b6b438 |
|
|
|
b6b438 |
if (state->tmp_creds.negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
|
|
|
b6b438 |
- netlogon_creds_aes_encrypt(&state->tmp_creds,
|
|
|
b6b438 |
- state->opaque.data,
|
|
|
b6b438 |
- state->opaque.length);
|
|
|
b6b438 |
+ status = netlogon_creds_aes_encrypt(&state->tmp_creds,
|
|
|
b6b438 |
+ state->opaque.data,
|
|
|
b6b438 |
+ state->opaque.length);
|
|
|
b6b438 |
+ if (tevent_req_nterror(req, status)) {
|
|
|
b6b438 |
+ netlogon_creds_cli_SendToSam_cleanup(req, status);
|
|
|
b6b438 |
+ return;
|
|
|
b6b438 |
+ }
|
|
|
b6b438 |
} else {
|
|
|
b6b438 |
status = netlogon_creds_arcfour_crypt(&state->tmp_creds,
|
|
|
b6b438 |
state->opaque.data,
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|