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

libcli:auth: Use GnuTLS MD5 in decode_wkssvc_join_password_buffer()

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2019-05-15 08:04:08 +02:00 committed by Andrew Bartlett
parent 10a1caa46d
commit 023e6b4f04
1 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libcli/auth/smbencrypt.c
View File

@ -961,9 +961,12 @@ WERROR decode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
DATA_BLOB *session_key,
char **pwd)
{
gnutls_hash_hd_t hash_hnd = NULL;
uint8_t buffer[516];
MD5_CTX ctx;
size_t pwd_len;
WERROR result;
bool ok;
int rc;
DATA_BLOB confounded_session_key;
@ -986,20 +989,42 @@ WERROR decode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
memcpy(&confounder, &pwd_buf->data[0], confounder_len);
memcpy(&buffer, &pwd_buf->data[8], 516);
MD5Init(&ctx);
MD5Update(&ctx, session_key->data, session_key->length);
MD5Update(&ctx, confounder, confounder_len);
MD5Final(confounded_session_key.data, &ctx);
rc = gnutls_hash_init(&hash_hnd, GNUTLS_DIG_MD5);
if (rc < 0) {
result = WERR_NOT_ENOUGH_MEMORY;
goto out;
}
rc = gnutls_hash(hash_hnd, session_key->data, session_key->length);
if (rc < 0) {
gnutls_hash_deinit(hash_hnd, NULL);
result = WERR_INTERNAL_ERROR;
goto out;
}
rc = gnutls_hash(hash_hnd, confounder, confounder_len);
if (rc < 0) {
gnutls_hash_deinit(hash_hnd, NULL);
result = WERR_INTERNAL_ERROR;
goto out;
}
gnutls_hash_deinit(hash_hnd, confounded_session_key.data);
arcfour_crypt_blob(buffer, 516, &confounded_session_key);
if (!decode_pw_buffer(mem_ctx, buffer, pwd, &pwd_len, CH_UTF16)) {
data_blob_free(&confounded_session_key);
return WERR_INVALID_PASSWORD;
ok = decode_pw_buffer(mem_ctx, buffer, pwd, &pwd_len, CH_UTF16);
ZERO_ARRAY(confounder);
ZERO_ARRAY(buffer);
data_blob_clear_free(&confounded_session_key);
if (!ok) {
result = WERR_INVALID_PASSWORD;
goto out;
}
data_blob_free(&confounded_session_key);
return WERR_OK;
result = WERR_OK;
out:
return result;
}