sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

libcli:auth: Return NTSTATUS for SMBOWFencrypt_ntv2()

Browse Source 
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>
This commit is contained in:
Andreas Schneider 2019-11-13 12:40:02 +01:00 committed by Andreas Schneider
parent 83b1c21dd0
commit 045b9eb3f0
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcli/auth/proto.h
View File

@ -139,8 +139,9 @@ void SMBOWFencrypt_ntv2(const uint8_t kr[16],
const DATA_BLOB *srv_chal, const DATA_BLOB *srv_chal,
const DATA_BLOB *smbcli_chal, const DATA_BLOB *smbcli_chal,
uint8_t resp_buf[16]); uint8_t resp_buf[16]);
void SMBsesskeygen_ntv2(const uint8_t kr[16], NTSTATUS SMBsesskeygen_ntv2(const uint8_t kr[16],
const uint8_t * nt_resp, uint8_t sess_key[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_ntv1(const uint8_t kr[16], uint8_t sess_key[16]);
void SMBsesskeygen_lm_sess_key(const uint8_t lm_hash[16], void SMBsesskeygen_lm_sess_key(const uint8_t lm_hash[16],
const uint8_t lm_resp[24], /* only uses 8 */ const uint8_t lm_resp[24], /* only uses 8 */

14
libcli/auth/smbencrypt.c
View File

@ -370,21 +370,29 @@ void SMBOWFencrypt_ntv2(const uint8_t kr[16],
#endif #endif
} }
void SMBsesskeygen_ntv2(const uint8_t kr[16], NTSTATUS SMBsesskeygen_ntv2(const uint8_t kr[16],
const uint8_t * nt_resp, uint8_t sess_key[16]) const uint8_t *nt_resp,
uint8_t sess_key[16])
{ {
int rc;
/* a very nice, 128 bit, variable session key */ /* a very nice, 128 bit, variable session key */
gnutls_hmac_fast(GNUTLS_MAC_MD5, rc = gnutls_hmac_fast(GNUTLS_MAC_MD5,
kr, kr,
16, 16,
nt_resp, nt_resp,
16, 16,
sess_key); sess_key);
if (rc != 0) {
return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
}
#ifdef DEBUG_PASSWORD #ifdef DEBUG_PASSWORD
DEBUG(100, ("SMBsesskeygen_ntv2:\n")); DEBUG(100, ("SMBsesskeygen_ntv2:\n"));
dump_data(100, sess_key, 16); dump_data(100, sess_key, 16);
#endif #endif
return NT_STATUS_OK;
} }
void SMBsesskeygen_ntv1(const uint8_t kr[16], uint8_t sess_key[16]) void SMBsesskeygen_ntv1(const uint8_t kr[16], uint8_t sess_key[16])