|
 |
b6b438 |
From cef95d8835a04065b9c7422a637f60efdb9a93fe Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Date: Fri, 16 Aug 2019 14:29:45 +1200
|
|
|
b6b438 |
Subject: [PATCH 098/187] auth/credentials: Check NTSTATUS return from
|
|
|
b6b438 |
netlogon_creds_aes_encrypt()
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
(cherry picked from commit fefd95091cc52f5e2655fa392312a8b1fa1d35fd)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
auth/credentials/credentials.c | 14 +++++++-------
|
|
|
b6b438 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
|
|
|
b6b438 |
index 5ebec483705..81f9dbb9eb3 100644
|
|
|
b6b438 |
--- a/auth/credentials/credentials.c
|
|
|
b6b438 |
+++ b/auth/credentials/credentials.c
|
|
|
b6b438 |
@@ -1333,19 +1333,19 @@ _PUBLIC_ NTSTATUS netlogon_creds_session_encrypt(
|
|
|
b6b438 |
return NT_STATUS_INVALID_PARAMETER;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
if (state->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
|
|
|
b6b438 |
- netlogon_creds_aes_encrypt(state,
|
|
|
b6b438 |
- data.data,
|
|
|
b6b438 |
- data.length);
|
|
|
b6b438 |
+ status = netlogon_creds_aes_encrypt(state,
|
|
|
b6b438 |
+ data.data,
|
|
|
b6b438 |
+ data.length);
|
|
|
b6b438 |
} else if (state->negotiate_flags & NETLOGON_NEG_ARCFOUR) {
|
|
|
b6b438 |
status = netlogon_creds_arcfour_crypt(state,
|
|
|
b6b438 |
data.data,
|
|
|
b6b438 |
data.length);
|
|
|
b6b438 |
- if (!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
- return status;
|
|
|
b6b438 |
- }
|
|
|
b6b438 |
} else {
|
|
|
b6b438 |
DBG_ERR("Unsupported encryption option negotiated");
|
|
|
b6b438 |
- return NT_STATUS_NOT_SUPPORTED;
|
|
|
b6b438 |
+ status = NT_STATUS_NOT_SUPPORTED;
|
|
|
b6b438 |
+ }
|
|
|
b6b438 |
+ if (!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
+ return status;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
return NT_STATUS_OK;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|