58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From b21a4ac4a6d92d720e1e04b9eadf50cc59a4ebe5 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Wed, 24 Jul 2019 16:24:18 +0200
|
|
Subject: [PATCH 048/187] s4_torture: Use GnuTLS RC4 in
|
|
test_ChangePasswordUser2
|
|
|
|
This uses STR_ASCII as string encodings.
|
|
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
(cherry picked from commit 9cbdf7b2e5f734e9b5e0e447d54d720d18977950)
|
|
---
|
|
source4/torture/rpc/samr.c | 21 ++++++++++++++++++++-
|
|
1 file changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
|
|
index 5bf758e2fb2..7f1da86d19a 100644
|
|
--- a/source4/torture/rpc/samr.c
|
|
+++ b/source4/torture/rpc/samr.c
|
|
@@ -2267,6 +2267,16 @@ static bool test_ChangePasswordUser2(struct dcerpc_pipe *p, struct torture_conte
|
|
struct lsa_String domain_name;
|
|
NTSTATUS status;
|
|
|
|
+ gnutls_cipher_hd_t cipher_hnd = NULL;
|
|
+ gnutls_datum_t old_lm_key = {
|
|
+ .data = old_lm_hash,
|
|
+ .size = sizeof(old_lm_hash),
|
|
+ };
|
|
+ gnutls_datum_t old_nt_key = {
|
|
+ .data = old_nt_hash,
|
|
+ .size = sizeof(old_nt_hash),
|
|
+ };
|
|
+
|
|
domain_name.string = "";
|
|
dom_pw_info.in.domain_name = &domain_name;
|
|
dom_pw_info.out.info = &info;
|
|
@@ -2298,7 +2308,16 @@ static bool test_ChangePasswordUser2(struct dcerpc_pipe *p, struct torture_conte
|
|
E_deshash(newpass, new_lm_hash);
|
|
|
|
encode_pw_buffer(lm_pass.data, newpass, STR_ASCII|STR_TERMINATE);
|
|
- arcfour_crypt(lm_pass.data, old_lm_hash, 516);
|
|
+
|
|
+ gnutls_cipher_init(&cipher_hnd,
|
|
+ GNUTLS_CIPHER_ARCFOUR_128,
|
|
+ &old_lm_key,
|
|
+ NULL);
|
|
+ gnutls_cipher_encrypt(cipher_hnd,
|
|
+ lm_pass.data,
|
|
+ 516);
|
|
+ gnutls_cipher_deinit(cipher_hnd);
|
|
+
|
|
E_old_pw_hash(new_nt_hash, old_lm_hash, lm_verifier.hash);
|
|
|
|
status = init_samr_CryptPassword(newpass,
|
|
--
|
|
2.23.0
|
|
|