From 88d136aae60d4aa8b6fe622e0e92a8bddbba1b1e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 25 Jul 2019 16:46:06 +1200 Subject: [PATCH 046/187] s4:torture: Use init_samr_CryptPassword in test_ChangePasswordUser2 This allows the use of GnuTLS for the RC4 crypto operation Signed-off-by: Andrew Bartlett Reviewed-by: Andreas Schneider (cherry picked from commit dfda49472e0b4a81653963e80d8d65788f80a591) --- source4/torture/rpc/samr.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index eb032905dc8..6cc508a2d44 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -2259,11 +2259,13 @@ static bool test_ChangePasswordUser2(struct dcerpc_pipe *p, struct torture_conte struct dcerpc_binding_handle *b = p->binding_handle; uint8_t old_nt_hash[16], new_nt_hash[16]; uint8_t old_lm_hash[16], new_lm_hash[16]; - + DATA_BLOB old_nt_hash_blob + = data_blob_const(old_nt_hash, sizeof(old_nt_hash)); struct samr_GetDomPwInfo dom_pw_info; struct samr_PwInfo info; struct lsa_String domain_name; + NTSTATUS status; domain_name.string = ""; dom_pw_info.in.domain_name = &domain_name; @@ -2299,8 +2301,13 @@ static bool test_ChangePasswordUser2(struct dcerpc_pipe *p, struct torture_conte arcfour_crypt(lm_pass.data, old_lm_hash, 516); E_old_pw_hash(new_nt_hash, old_lm_hash, lm_verifier.hash); - encode_pw_buffer(nt_pass.data, newpass, STR_UNICODE); - arcfour_crypt(nt_pass.data, old_nt_hash, 516); + status = init_samr_CryptPassword(newpass, + &old_nt_hash_blob, + &nt_pass); + torture_assert_ntstatus_ok(tctx, + status, + "init_samr_CryptPassword failed"); + E_old_pw_hash(new_nt_hash, old_nt_hash, nt_verifier.hash); r.in.server = &server; -- 2.23.0