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

auth:ntlmssp: Use gnutls_error_to_ntstatus() in ntlmssp_client

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2019-06-11 15:16:31 +02:00 committed by Andreas Schneider
parent 226895baa9
commit 35573821b6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
auth/ntlmssp/ntlmssp_client.c
View File

@ -35,6 +35,7 @@ struct auth_session_info;
#include "../auth/ntlmssp/ntlmssp_ndr.h" #include "../auth/ntlmssp/ntlmssp_ndr.h"
#include "../nsswitch/libwbclient/wbclient.h" #include "../nsswitch/libwbclient/wbclient.h"
#include "libcli/util/gnutls_error.h"
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/crypto.h> #include <gnutls/crypto.h>
@ -749,10 +750,7 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
session_key.data, session_key.data,
MIN(session_key.length, 64)); MIN(session_key.length, 64));
if (rc < 0) { if (rc < 0) {
nt_status = NT_STATUS_NO_MEMORY; nt_status = gnutls_error_to_ntstatus(rc, NT_STATUS_NTLM_BLOCKED);
if (rc == GNUTLS_E_UNWANTED_ALGORITHM) {
nt_status = NT_STATUS_NTLM_BLOCKED;
}
goto done; goto done;
} }
@ -761,19 +759,19 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
ntlmssp_state->negotiate_blob.length); ntlmssp_state->negotiate_blob.length);
if (rc < 0) { if (rc < 0) {
gnutls_hmac_deinit(hmac_hnd, NULL); gnutls_hmac_deinit(hmac_hnd, NULL);
nt_status = NT_STATUS_INTERNAL_ERROR; nt_status = gnutls_error_to_ntstatus(rc, NT_STATUS_NTLM_BLOCKED);
goto done; goto done;
} }
rc = gnutls_hmac(hmac_hnd, in.data, in.length); rc = gnutls_hmac(hmac_hnd, in.data, in.length);
if (rc < 0) { if (rc < 0) {
gnutls_hmac_deinit(hmac_hnd, NULL); gnutls_hmac_deinit(hmac_hnd, NULL);
nt_status = NT_STATUS_INTERNAL_ERROR; nt_status = gnutls_error_to_ntstatus(rc, NT_STATUS_NTLM_BLOCKED);
goto done; goto done;
} }
rc = gnutls_hmac(hmac_hnd, out->data, out->length); rc = gnutls_hmac(hmac_hnd, out->data, out->length);
if (rc < 0) { if (rc < 0) {
gnutls_hmac_deinit(hmac_hnd, NULL); gnutls_hmac_deinit(hmac_hnd, NULL);
nt_status = NT_STATUS_INTERNAL_ERROR; nt_status = gnutls_error_to_ntstatus(rc, NT_STATUS_NTLM_BLOCKED);
goto done; goto done;
} }