|
 |
b6b438 |
From 905ffa85002a4100172835c550547bab024ef30f Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Wed, 24 Jul 2019 15:59:19 +0200
|
|
|
b6b438 |
Subject: [PATCH 044/187] s4:torture: Use init_samr_CryptPassword in
|
|
|
b6b438 |
test_SetUserPass_level_ex
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
(cherry picked from commit f45ba47afb11c1f7bbb8c5c84670395500e1afc1)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
source4/torture/rpc/samr.c | 48 +++++++++++++++++++-------------------
|
|
|
b6b438 |
1 file changed, 24 insertions(+), 24 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
|
|
|
b6b438 |
index 2f67bcf6be7..530c457bbd9 100644
|
|
|
b6b438 |
--- a/source4/torture/rpc/samr.c
|
|
|
b6b438 |
+++ b/source4/torture/rpc/samr.c
|
|
|
b6b438 |
@@ -1166,9 +1166,6 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
|
|
|
b6b438 |
union samr_UserInfo u;
|
|
|
b6b438 |
bool ret = true;
|
|
|
b6b438 |
DATA_BLOB session_key;
|
|
|
b6b438 |
- DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
|
|
|
b6b438 |
- gnutls_hash_hd_t hash_hnd;
|
|
|
b6b438 |
- uint8_t confounder[16];
|
|
|
b6b438 |
char *newpass;
|
|
|
b6b438 |
struct dcerpc_binding_handle *b = p->binding_handle;
|
|
|
b6b438 |
struct samr_GetUserPwInfo pwp;
|
|
|
b6b438 |
@@ -1244,28 +1241,20 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
|
|
|
b6b438 |
u.info23.info.password_expired = password_expired;
|
|
|
b6b438 |
u.info23.info.comment.string = comment;
|
|
|
b6b438 |
|
|
|
b6b438 |
- encode_pw_buffer(u.info23.password.data, newpass, STR_UNICODE);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
case 24:
|
|
|
b6b438 |
u.info24.password_expired = password_expired;
|
|
|
b6b438 |
|
|
|
b6b438 |
- encode_pw_buffer(u.info24.password.data, newpass, STR_UNICODE);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
case 25:
|
|
|
b6b438 |
u.info25.info.fields_present = fields_present;
|
|
|
b6b438 |
u.info25.info.password_expired = password_expired;
|
|
|
b6b438 |
u.info25.info.comment.string = comment;
|
|
|
b6b438 |
|
|
|
b6b438 |
- encode_pw_buffer(u.info25.password.data, newpass, STR_UNICODE);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
case 26:
|
|
|
b6b438 |
u.info26.password_expired = password_expired;
|
|
|
b6b438 |
|
|
|
b6b438 |
- encode_pw_buffer(u.info26.password.data, newpass, STR_UNICODE);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
@@ -1276,13 +1265,6 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
|
|
|
b6b438 |
return false;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
- generate_random_buffer((uint8_t *)confounder, 16);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
- gnutls_hash_init(&hash_hnd, GNUTLS_DIG_MD5);
|
|
|
b6b438 |
- gnutls_hash(hash_hnd, confounder, 16);
|
|
|
b6b438 |
- gnutls_hash(hash_hnd, session_key.data, session_key.length);
|
|
|
b6b438 |
- gnutls_hash_deinit(hash_hnd, confounded_session_key.data);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
switch (level) {
|
|
|
b6b438 |
case 18:
|
|
|
b6b438 |
{
|
|
|
b6b438 |
@@ -1320,18 +1302,36 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
|
|
|
b6b438 |
}
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
case 23:
|
|
|
b6b438 |
- arcfour_crypt_blob(u.info23.password.data, 516, &session_key);
|
|
|
b6b438 |
+ status = init_samr_CryptPassword(newpass,
|
|
|
b6b438 |
+ &session_key,
|
|
|
b6b438 |
+ &u.info23.password);
|
|
|
b6b438 |
+ torture_assert_ntstatus_ok(tctx,
|
|
|
b6b438 |
+ status,
|
|
|
b6b438 |
+ "init_samr_CryptPassword failed");
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
case 24:
|
|
|
b6b438 |
- arcfour_crypt_blob(u.info24.password.data, 516, &session_key);
|
|
|
b6b438 |
+ status = init_samr_CryptPassword(newpass,
|
|
|
b6b438 |
+ &session_key,
|
|
|
b6b438 |
+ &u.info24.password);
|
|
|
b6b438 |
+ torture_assert_ntstatus_ok(tctx,
|
|
|
b6b438 |
+ status,
|
|
|
b6b438 |
+ "init_samr_CryptPassword failed");
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
case 25:
|
|
|
b6b438 |
- arcfour_crypt_blob(u.info25.password.data, 516, &confounded_session_key);
|
|
|
b6b438 |
- memcpy(&u.info25.password.data[516], confounder, 16);
|
|
|
b6b438 |
+ status = init_samr_CryptPasswordEx(newpass,
|
|
|
b6b438 |
+ &session_key,
|
|
|
b6b438 |
+ &u.info25.password);
|
|
|
b6b438 |
+ torture_assert_ntstatus_ok(tctx,
|
|
|
b6b438 |
+ status,
|
|
|
b6b438 |
+ "init_samr_CryptPasswordEx failed");
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
case 26:
|
|
|
b6b438 |
- arcfour_crypt_blob(u.info26.password.data, 516, &confounded_session_key);
|
|
|
b6b438 |
- memcpy(&u.info26.password.data[516], confounder, 16);
|
|
|
b6b438 |
+ status = init_samr_CryptPasswordEx(newpass,
|
|
|
b6b438 |
+ &session_key,
|
|
|
b6b438 |
+ &u.info26.password);
|
|
|
b6b438 |
+ torture_assert_ntstatus_ok(tctx,
|
|
|
b6b438 |
+ status,
|
|
|
b6b438 |
+ "init_samr_CryptPasswordEx failed");
|
|
|
b6b438 |
break;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|