|
 |
b6b438 |
From cbabf1224f61900eb96ea15841950c26b8b88cb5 Mon Sep 17 00:00:00 2001
|
|
|
b6b438 |
From: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Date: Mon, 8 Jul 2019 18:03:00 +0200
|
|
|
b6b438 |
Subject: [PATCH 027/187] libcli:auth: Use
|
|
|
b6b438 |
samba_gnutls_arcfour_confounded_md5() in encode_wkssvc_join_password_buffer()
|
|
|
b6b438 |
|
|
|
b6b438 |
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14031
|
|
|
b6b438 |
|
|
|
b6b438 |
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
|
b6b438 |
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
|
b6b438 |
(cherry picked from commit 85e2a3c96ad9acc1a85db189f6418c9d880b4718)
|
|
|
b6b438 |
---
|
|
|
b6b438 |
libcli/auth/smbencrypt.c | 69 ++++++++++++++--------------------------
|
|
|
b6b438 |
1 file changed, 23 insertions(+), 46 deletions(-)
|
|
|
b6b438 |
|
|
|
b6b438 |
diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
|
|
|
b6b438 |
index 745f47999cd..823e16a3387 100644
|
|
|
b6b438 |
--- a/libcli/auth/smbencrypt.c
|
|
|
b6b438 |
+++ b/libcli/auth/smbencrypt.c
|
|
|
b6b438 |
@@ -968,65 +968,42 @@ bool extract_pw_from_buffer(TALLOC_CTX *mem_ctx,
|
|
|
b6b438 |
WERROR encode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
|
|
|
b6b438 |
const char *pwd,
|
|
|
b6b438 |
DATA_BLOB *session_key,
|
|
|
b6b438 |
- struct wkssvc_PasswordBuffer **pwd_buf)
|
|
|
b6b438 |
+ struct wkssvc_PasswordBuffer **out_pwd_buf)
|
|
|
b6b438 |
{
|
|
|
b6b438 |
- uint8_t buffer[516];
|
|
|
b6b438 |
- gnutls_hash_hd_t hash_hnd = NULL;
|
|
|
b6b438 |
- struct wkssvc_PasswordBuffer *my_pwd_buf = NULL;
|
|
|
b6b438 |
- DATA_BLOB confounded_session_key;
|
|
|
b6b438 |
- int confounder_len = 8;
|
|
|
b6b438 |
- uint8_t confounder[8];
|
|
|
b6b438 |
- WERROR werr;
|
|
|
b6b438 |
+ struct wkssvc_PasswordBuffer *pwd_buf = NULL;
|
|
|
b6b438 |
+ uint8_t _confounder[8] = {0};
|
|
|
b6b438 |
+ DATA_BLOB confounder = data_blob_const(_confounder, 8);
|
|
|
b6b438 |
+ uint8_t pwbuf[516] = {0};
|
|
|
b6b438 |
+ DATA_BLOB encrypt_pwbuf = data_blob_const(pwbuf, 516);
|
|
|
b6b438 |
int rc;
|
|
|
b6b438 |
|
|
|
b6b438 |
- my_pwd_buf = talloc_zero(mem_ctx, struct wkssvc_PasswordBuffer);
|
|
|
b6b438 |
- if (!my_pwd_buf) {
|
|
|
b6b438 |
+ pwd_buf = talloc_zero(mem_ctx, struct wkssvc_PasswordBuffer);
|
|
|
b6b438 |
+ if (pwd_buf == NULL) {
|
|
|
b6b438 |
return WERR_NOT_ENOUGH_MEMORY;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
- confounded_session_key = data_blob_talloc(mem_ctx, NULL, 16);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
- encode_pw_buffer(buffer, pwd, STR_UNICODE);
|
|
|
b6b438 |
+ encode_pw_buffer(pwbuf, pwd, STR_UNICODE);
|
|
|
b6b438 |
|
|
|
b6b438 |
- generate_random_buffer((uint8_t *)confounder, confounder_len);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
- rc = gnutls_hash_init(&hash_hnd, GNUTLS_DIG_MD5);
|
|
|
b6b438 |
- if (rc < 0) {
|
|
|
b6b438 |
- werr = gnutls_error_to_werror(rc, WERR_INTERNAL_ERROR);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
- goto out;
|
|
|
b6b438 |
- }
|
|
|
b6b438 |
-
|
|
|
b6b438 |
- rc = gnutls_hash(hash_hnd, session_key->data, session_key->length);
|
|
|
b6b438 |
- if (rc < 0) {
|
|
|
b6b438 |
- gnutls_hash_deinit(hash_hnd, NULL);
|
|
|
b6b438 |
- werr = gnutls_error_to_werror(rc, WERR_INTERNAL_ERROR);
|
|
|
b6b438 |
+ generate_random_buffer(_confounder, sizeof(_confounder));
|
|
|
b6b438 |
|
|
|
b6b438 |
- goto out;
|
|
|
b6b438 |
- }
|
|
|
b6b438 |
- rc = gnutls_hash(hash_hnd, confounder, confounder_len);
|
|
|
b6b438 |
+ rc = samba_gnutls_arcfour_confounded_md5(session_key,
|
|
|
b6b438 |
+ &confounder,
|
|
|
b6b438 |
+ &encrypt_pwbuf,
|
|
|
b6b438 |
+ SAMBA_GNUTLS_ENCRYPT);
|
|
|
b6b438 |
if (rc < 0) {
|
|
|
b6b438 |
- gnutls_hash_deinit(hash_hnd, NULL);
|
|
|
b6b438 |
- werr = gnutls_error_to_werror(rc, WERR_INTERNAL_ERROR);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
- goto out;
|
|
|
b6b438 |
+ ZERO_ARRAY(_confounder);
|
|
|
b6b438 |
+ TALLOC_FREE(pwd_buf);
|
|
|
b6b438 |
+ return gnutls_error_to_werror(rc, WERR_CONTENT_BLOCKED);
|
|
|
b6b438 |
}
|
|
|
b6b438 |
- gnutls_hash_deinit(hash_hnd, confounded_session_key.data);
|
|
|
b6b438 |
|
|
|
b6b438 |
- arcfour_crypt_blob(buffer, 516, &confounded_session_key);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
- memcpy(&my_pwd_buf->data[0], confounder, confounder_len);
|
|
|
b6b438 |
- ZERO_ARRAY(confounder);
|
|
|
b6b438 |
- memcpy(&my_pwd_buf->data[8], buffer, 516);
|
|
|
b6b438 |
- ZERO_ARRAY(buffer);
|
|
|
b6b438 |
-
|
|
|
b6b438 |
- data_blob_clear_free(&confounded_session_key);
|
|
|
b6b438 |
+ memcpy(&pwd_buf->data[0], confounder.data, confounder.length);
|
|
|
b6b438 |
+ ZERO_ARRAY(_confounder);
|
|
|
b6b438 |
+ memcpy(&pwd_buf->data[8], encrypt_pwbuf.data, encrypt_pwbuf.length);
|
|
|
b6b438 |
+ ZERO_ARRAY(pwbuf);
|
|
|
b6b438 |
|
|
|
b6b438 |
- *pwd_buf = my_pwd_buf;
|
|
|
b6b438 |
+ *out_pwd_buf = pwd_buf;
|
|
|
b6b438 |
|
|
|
b6b438 |
- werr = WERR_OK;
|
|
|
b6b438 |
-out:
|
|
|
b6b438 |
- return werr;
|
|
|
b6b438 |
+ return WERR_OK;
|
|
|
b6b438 |
}
|
|
|
b6b438 |
|
|
|
b6b438 |
WERROR decode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
|
|
|
b6b438 |
--
|
|
|
b6b438 |
2.23.0
|
|
|
b6b438 |
|