sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

pycredentials: make use of netlogon_creds_encrypt_samr_CryptPassword in py_creds_encrypt_netr_crypt_password

Browse Source 
These will simplify adding the logic for netr_ServerAuthenticateKerberos...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15425

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
(cherry picked from commit ea792fa342)
This commit is contained in:
Stefan Metzmacher 2024-10-28 14:06:28 +01:00 committed by Jule Anger
parent a616dcc89d
commit 7f1db18b44
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
auth/credentials/pycredentials.c
View File

@ -1024,9 +1024,11 @@ static PyObject *py_creds_get_aes256_key(PyObject *self, PyObject *args)
static PyObject *py_creds_encrypt_netr_crypt_password(PyObject *self,
PyObject *args)
{
DATA_BLOB data = data_blob_null;
struct cli_credentials *creds = NULL;
struct netr_CryptPassword *pwd = NULL;
struct samr_CryptPassword spwd;
enum dcerpc_AuthType auth_type = DCERPC_AUTH_TYPE_NONE;
enum dcerpc_AuthLevel auth_level = DCERPC_AUTH_LEVEL_NONE;
NTSTATUS status;
PyObject *py_cp = Py_None;
@ -1045,9 +1047,18 @@ static PyObject *py_creds_encrypt_netr_crypt_password(PyObject *self,
/* pytalloc_get_type sets TypeError */
return NULL;
}
data.length = sizeof(struct netr_CryptPassword);
data.data = (uint8_t *)pwd;
status = netlogon_creds_session_encrypt(creds->netlogon_creds, data);
memcpy(spwd.data, pwd->data, 512);
PUSH_LE_U32(spwd.data, 512, pwd->length);
status = netlogon_creds_encrypt_samr_CryptPassword(creds->netlogon_creds,
&spwd,
auth_type,
auth_level);
memcpy(pwd->data, spwd.data, 512);
pwd->length = PULL_LE_U32(spwd.data, 512);
ZERO_STRUCT(spwd);
PyErr_NTSTATUS_IS_ERR_RAISE(status);