sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3:rpc_client: Return NTSTATUS for init_samr_CryptPasswordEx()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14031

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2019-05-29 17:16:26 +02:00 committed by Andrew Bartlett
parent 4b9b1dbe9c
commit 7915a48e53
6 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/lib/netapi/user.c
View File

@ -313,9 +313,12 @@ static NTSTATUS set_user_info_USER_INFO_X(TALLOC_CTX *ctx,
user_info.info25.info = info21;
init_samr_CryptPasswordEx(uX->usriX_password,
session_key,
&user_info.info25.password);
status = init_samr_CryptPasswordEx(uX->usriX_password,
session_key,
&user_info.info25.password);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
status = dcerpc_samr_SetUserInfo2(b, talloc_tos(),
user_handle,

9
source3/libnet/libnet_join.c
View File

@ -1522,9 +1522,12 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
*/
old_timeout = rpccli_set_timeout(pipe_hnd, 600000);
init_samr_CryptPasswordEx(r->in.machine_password,
&session_key,
&crypt_pwd_ex);
status = init_samr_CryptPasswordEx(r->in.machine_password,
&session_key,
&crypt_pwd_ex);
if (!NT_STATUS_IS_OK(status)) {
goto error;
}
user_info.info26.password = crypt_pwd_ex;
user_info.info26.password_expired = PASS_DONT_CHANGE_AT_NEXT_LOGON;

27
source3/rpc_client/init_samr.c
View File

@ -22,6 +22,7 @@
#include "../lib/crypto/arcfour.h"
#include "rpc_client/init_samr.h"
#include "lib/crypto/gnutls_helpers.h"
#include <gnutls/gnutls.h>
#include <gnutls/crypto.h>
@ -29,9 +30,9 @@
inits a samr_CryptPasswordEx structure
*************************************************************************/
void init_samr_CryptPasswordEx(const char *pwd,
DATA_BLOB *session_key,
struct samr_CryptPasswordEx *pwd_buf)
NTSTATUS init_samr_CryptPasswordEx(const char *pwd,
DATA_BLOB *session_key,
struct samr_CryptPasswordEx *pwd_buf)
{
/* samr_CryptPasswordEx */
@ -39,42 +40,52 @@ void init_samr_CryptPasswordEx(const char *pwd,
gnutls_hash_hd_t hash_hnd = NULL;
uint8_t confounder[16];
DATA_BLOB confounded_session_key = data_blob(NULL, 16);
NTSTATUS status;
bool ok;
int rc;
encode_pw_buffer(pwbuf, pwd, STR_UNICODE);
ok = encode_pw_buffer(pwbuf, pwd, STR_UNICODE);
if (!ok) {
status = NT_STATUS_INTERNAL_ERROR;
goto out;
}
generate_random_buffer((uint8_t *)confounder, 16);
rc = gnutls_hash_init(&hash_hnd, GNUTLS_DIG_MD5);
if (rc < 0) {
status = gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
goto out;
}
rc = gnutls_hash(hash_hnd, confounder, 16);
if (rc < 0) {
gnutls_hash_deinit(hash_hnd, NULL);
status = gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
goto out;
}
rc = gnutls_hash(hash_hnd, session_key->data, session_key->length);
if (rc < 0) {
gnutls_hash_deinit(hash_hnd, NULL);
status = gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
goto out;
}
gnutls_hash_deinit(hash_hnd, confounded_session_key.data);
arcfour_crypt_blob(pwbuf, 516, &confounded_session_key);
ZERO_ARRAY_LEN(confounded_session_key.data,
confounded_session_key.length);
data_blob_free(&confounded_session_key);
data_blob_clear_free(&confounded_session_key);
memcpy(&pwbuf[516], confounder, 16);
ZERO_ARRAY(confounder);
memcpy(pwd_buf->data, pwbuf, sizeof(pwbuf));
ZERO_ARRAY(pwbuf);
status = NT_STATUS_OK;
out:
return;
data_blob_clear_free(&confounded_session_key);
return status;
}
/*************************************************************************

6
source3/rpc_client/init_samr.h
View File

@ -22,9 +22,9 @@
/* The following definitions come from rpc_client/init_samr.c */
void init_samr_CryptPasswordEx(const char *pwd,
DATA_BLOB *session_key,
struct samr_CryptPasswordEx *pwd_buf);
NTSTATUS init_samr_CryptPasswordEx(const char *pwd,
DATA_BLOB *session_key,
struct samr_CryptPasswordEx *pwd_buf);
NTSTATUS init_samr_CryptPassword(const char *pwd,
DATA_BLOB *session_key,
struct samr_CryptPassword *pwd_buf);

9
source3/rpc_server/netlogon/srv_netlog_nt.c
View File

@ -1226,9 +1226,12 @@ static NTSTATUS netr_set_machine_account_password(TALLOC_CTX *mem_ctx,
infolevel = UserInternal5InformationNew;
init_samr_CryptPasswordEx(cr->creds.password,
&session_key,
&info26.password);
status = init_samr_CryptPasswordEx(cr->creds.password,
&session_key,
&info26.password);
if (!NT_STATUS_IS_OK(status)) {
goto out;
}
info26.password_expired = PASS_DONT_CHANGE_AT_NEXT_LOGON;
info->info26 = info26;

5
source3/rpcclient/cmd_samr.c
View File

@ -3067,7 +3067,10 @@ static NTSTATUS cmd_samr_setuserinfo_int(struct rpc_pipe_client *cli,
if (!NT_STATUS_IS_OK(status)) {
return status;
}
init_samr_CryptPasswordEx(param, &session_key, &pwd_buf_ex);
status = init_samr_CryptPasswordEx(param, &session_key, &pwd_buf_ex);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
nt_lm_owf_gen(param, nt_hash, lm_hash);
switch (level) {