diff options
| author | Andreas Schneider <asn@samba.org> | 2018-11-09 12:33:10 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-06-27 12:54:24 +0000 |
| commit | 0a8a1c9c78f4f4eda45514a267e080543b3c29ef (patch) | |
| tree | 76aa2da9af622fcce853183c6d61c4de4bc0a059 /auth | |
| parent | ba96534eb3b895d1424e25b82dcb1f7f374f5959 (diff) | |
| download | samba-0a8a1c9c78f4f4eda45514a267e080543b3c29ef.tar.gz | |
auth:ntlmssp: Use GnuTLS RC4 in ntlmssp server
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/ntlmssp/ntlmssp_server.c | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c index 8fa7baa04d7..5a56a4db99f 100644 --- a/auth/ntlmssp/ntlmssp_server.c +++ b/auth/ntlmssp/ntlmssp_server.c @@ -1033,12 +1033,32 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_security *gensec_security, ntlmssp_state->session_key = session_key; talloc_steal(ntlmssp_state, session_key.data); } else { + gnutls_cipher_hd_t cipher_hnd; + gnutls_datum_t enc_session_key = { + .data = session_key.data, + .size = session_key.length, + }; + int rc; + dump_data_pw("KEY_EXCH session key (enc):\n", state->encrypted_session_key.data, state->encrypted_session_key.length); - arcfour_crypt(state->encrypted_session_key.data, - session_key.data, - state->encrypted_session_key.length); + + rc = gnutls_cipher_init(&cipher_hnd, + GNUTLS_CIPHER_ARCFOUR_128, + &enc_session_key, + NULL); + if (rc < 0) { + return gnutls_error_to_ntstatus(rc, NT_STATUS_NTLM_BLOCKED); + } + rc = gnutls_cipher_encrypt(cipher_hnd, + state->encrypted_session_key.data, + state->encrypted_session_key.length); + gnutls_cipher_deinit(cipher_hnd); + if (rc < 0) { + return gnutls_error_to_ntstatus(rc, NT_STATUS_NTLM_BLOCKED); + } + ntlmssp_state->session_key = data_blob_talloc(ntlmssp_state, state->encrypted_session_key.data, state->encrypted_session_key.length); |