|
 |
b6b438 |
From 007b56943bbec3c3b9b28be08c3088b0d28ba2d8 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Tue, 12 Nov 2019 16:56:45 +0100
|
|
|
b6b438 |
Subject: [PATCH 199/208] s3:rpc_server: Allow RC4 encrypted buffers in
|
|
|
b6b438 |
samr_SetUserInfo()
|
|
|
b6b438 |
|
|
|
b6b438 |
This is only allowed if we have a sealed connections!
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
---
|
|
|
b6b438 |
source3/rpc_server/samr/srv_samr_nt.c | 24 ++++++++++++++++++++++++
|
|
|
b6b438 |
1 file changed, 24 insertions(+)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
|
|
|
b6b438 |
index 91771e34502..509bce57a3b 100644
|
|
|
b6b438 |
--- a/source3/rpc_server/samr/srv_samr_nt.c
|
|
|
b6b438 |
+++ b/source3/rpc_server/samr/srv_samr_nt.c
|
|
|
b6b438 |
@@ -5210,9 +5210,15 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
|
|
|
b6b438 |
if(!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
+ /*
|
|
|
b6b438 |
+ * This can be allowed as it requires a session key
|
|
|
b6b438 |
+ * which we only have if we have a SMB session.
|
|
|
b6b438 |
+ */
|
|
|
b6b438 |
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
|
|
b6b438 |
status = arc4_decrypt_data(session_key,
|
|
|
b6b438 |
info->info23.password.data,
|
|
|
b6b438 |
516);
|
|
|
b6b438 |
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
|
|
b6b438 |
if(!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
@@ -5233,9 +5239,15 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
|
|
|
b6b438 |
if(!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
+ /*
|
|
|
b6b438 |
+ * This can be allowed as it requires a session key
|
|
|
b6b438 |
+ * which we only have if we have a SMB session.
|
|
|
b6b438 |
+ */
|
|
|
b6b438 |
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
|
|
b6b438 |
status = arc4_decrypt_data(session_key,
|
|
|
b6b438 |
info->info24.password.data,
|
|
|
b6b438 |
516);
|
|
|
b6b438 |
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
|
|
b6b438 |
if(!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
@@ -5254,8 +5266,14 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
|
|
|
b6b438 |
if(!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
+ /*
|
|
|
b6b438 |
+ * This can be allowed as it requires a session key
|
|
|
b6b438 |
+ * which we only have if we have a SMB session.
|
|
|
b6b438 |
+ */
|
|
|
b6b438 |
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
|
|
b6b438 |
status = decode_rc4_passwd_buffer(&session_key,
|
|
|
b6b438 |
&info->info25.password);
|
|
|
b6b438 |
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
|
|
b6b438 |
if (!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
@@ -5274,8 +5292,14 @@ NTSTATUS _samr_SetUserInfo(struct pipes_struct *p,
|
|
|
b6b438 |
if(!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
+ /*
|
|
|
b6b438 |
+ * This can be allowed as it requires a session key
|
|
|
b6b438 |
+ * which we only have if we have a SMB session.
|
|
|
b6b438 |
+ */
|
|
|
b6b438 |
+ GNUTLS_FIPS140_SET_LAX_MODE();
|
|
|
b6b438 |
status = decode_rc4_passwd_buffer(&session_key,
|
|
|
b6b438 |
&info->info26.password);
|
|
|
b6b438 |
+ GNUTLS_FIPS140_SET_STRICT_MODE();
|
|
|
b6b438 |
if (!NT_STATUS_IS_OK(status)) {
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|