git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6434501
)
s3-rpc_server: support AES decryption in netr_ServerPasswordSet2 server.
author
Günther Deschner
<gd@samba.org>
Thu, 29 Nov 2012 20:35:04 +0000
(21:35 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Sun, 9 Dec 2012 18:39:07 +0000
(19:39 +0100)
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/rpc_server/netlogon/srv_netlog_nt.c
patch
|
blob
|
history
diff --git
a/source3/rpc_server/netlogon/srv_netlog_nt.c
b/source3/rpc_server/netlogon/srv_netlog_nt.c
index d992a65561b1ae83c74dc598657a3cec6e1662cb..5fc27569637763749be23d5d3dcfc922898459b5 100644
(file)
--- a/
source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/
source3/rpc_server/netlogon/srv_netlog_nt.c
@@
-1332,7
+1332,12
@@
NTSTATUS _netr_ServerPasswordSet2(struct pipes_struct *p,
memcpy(password_buf.data, r->in.new_password->data, 512);
SIVAL(password_buf.data, 512, r->in.new_password->length);
- netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
+
+ if (creds->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
+ netlogon_creds_aes_decrypt(creds, password_buf.data, 516);
+ } else {
+ netlogon_creds_arcfour_crypt(creds, password_buf.data, 516);
+ }
if (!extract_pw_from_buffer(p->mem_ctx, password_buf.data, &plaintext)) {
TALLOC_FREE(creds);