77 lines
2.3 KiB
Diff
77 lines
2.3 KiB
Diff
From 3900f0a63c3aedee8b5a53e4eda4c41a6b0f0f3e Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Wed, 13 Nov 2019 12:40:02 +0100
|
|
Subject: [PATCH 139/187] libcli:auth: Return NTSTATUS for SMBOWFencrypt_ntv2()
|
|
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14195
|
|
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
|
(cherry picked from commit 045b9eb3f088c66e20bd19e144a2ce3597328d93)
|
|
---
|
|
libcli/auth/proto.h | 5 +++--
|
|
libcli/auth/smbencrypt.c | 24 ++++++++++++++++--------
|
|
2 files changed, 19 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
|
|
index 714652bdb76..4c20783124b 100644
|
|
--- a/libcli/auth/proto.h
|
|
+++ b/libcli/auth/proto.h
|
|
@@ -139,8 +139,9 @@ void SMBOWFencrypt_ntv2(const uint8_t kr[16],
|
|
const DATA_BLOB *srv_chal,
|
|
const DATA_BLOB *smbcli_chal,
|
|
uint8_t resp_buf[16]);
|
|
-void SMBsesskeygen_ntv2(const uint8_t kr[16],
|
|
- const uint8_t * nt_resp, uint8_t sess_key[16]);
|
|
+NTSTATUS SMBsesskeygen_ntv2(const uint8_t kr[16],
|
|
+ const uint8_t *nt_resp,
|
|
+ uint8_t sess_key[16]);
|
|
void SMBsesskeygen_ntv1(const uint8_t kr[16], uint8_t sess_key[16]);
|
|
void SMBsesskeygen_lm_sess_key(const uint8_t lm_hash[16],
|
|
const uint8_t lm_resp[24], /* only uses 8 */
|
|
diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
|
|
index cc5e1fbb899..904d2c38219 100644
|
|
--- a/libcli/auth/smbencrypt.c
|
|
+++ b/libcli/auth/smbencrypt.c
|
|
@@ -370,21 +370,29 @@ void SMBOWFencrypt_ntv2(const uint8_t kr[16],
|
|
#endif
|
|
}
|
|
|
|
-void SMBsesskeygen_ntv2(const uint8_t kr[16],
|
|
- const uint8_t * nt_resp, uint8_t sess_key[16])
|
|
+NTSTATUS SMBsesskeygen_ntv2(const uint8_t kr[16],
|
|
+ const uint8_t *nt_resp,
|
|
+ uint8_t sess_key[16])
|
|
{
|
|
+ int rc;
|
|
+
|
|
/* a very nice, 128 bit, variable session key */
|
|
- gnutls_hmac_fast(GNUTLS_MAC_MD5,
|
|
- kr,
|
|
- 16,
|
|
- nt_resp,
|
|
- 16,
|
|
- sess_key);
|
|
+ rc = gnutls_hmac_fast(GNUTLS_MAC_MD5,
|
|
+ kr,
|
|
+ 16,
|
|
+ nt_resp,
|
|
+ 16,
|
|
+ sess_key);
|
|
+ if (rc != 0) {
|
|
+ return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
|
|
+ }
|
|
|
|
#ifdef DEBUG_PASSWORD
|
|
DEBUG(100, ("SMBsesskeygen_ntv2:\n"));
|
|
dump_data(100, sess_key, 16);
|
|
#endif
|
|
+
|
|
+ return NT_STATUS_OK;
|
|
}
|
|
|
|
void SMBsesskeygen_ntv1(const uint8_t kr[16], uint8_t sess_key[16])
|
|
--
|
|
2.23.0
|
|
|