vauth: Moved the NTLM authentication code to the new vauth directory (6012fa5a) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.inc

+7 −8

Original line number	Diff line number	Diff line
		@@ -22,9 +22,9 @@

		LIB_VAUTH_CFILES = vauth/vauth.c vauth/cleartext.c vauth/cram.c \
		vauth/digest.c vauth/digest_sspi.c vauth/krb5_gssapi.c \
		vauth/krb5_sspi.c
		vauth/krb5_sspi.c vauth/ntlm.c vauth/ntlm_sspi.c

		LIB_VAUTH_HFILES = vauth/vauth.h vauth/digest.h
		LIB_VAUTH_HFILES = vauth/vauth.h vauth/digest.h vauth/ntlm.h

		LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c \
		vtls/polarssl.c vtls/polarssl_threadlock.c vtls/axtls.c \
		@@ -51,9 +51,8 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
		openldap.c curl_gethostname.c gopher.c idn_win32.c \
		http_negotiate_sspi.c http_proxy.c non-ascii.c asyn-ares.c \
		asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \
		curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_multibyte.c \
		hostcheck.c conncache.c pipeline.c dotdot.c x509asn1.c \
		http2.c curl_sasl_sspi.c smb.c curl_endian.c curl_des.c
		curl_ntlm_core.c curl_sasl.c curl_multibyte.c hostcheck.c conncache.c \
		pipeline.c dotdot.c x509asn1.c http2.c smb.c curl_endian.c curl_des.c

		LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
		formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h \
		@@ -69,9 +68,9 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
		rtsp.h curl_threads.h warnless.h curl_hmac.h curl_rtmp.h \
		curl_gethostname.h gopher.h http_proxy.h non-ascii.h asyn.h \
		curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h \
		curl_ntlm_msgs.h curl_sasl.h curl_multibyte.h hostcheck.h \
		conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h \
		dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h \
		curl_sasl.h curl_multibyte.h hostcheck.h conncache.h \
		curl_setup_once.h multihandle.h setup-vms.h pipeline.h dotdot.h \
		x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h \
		curl_printf.h

		LIB_RCFILES = libcurl.rc

lib/Makefile.vc6

+2 −2

Original line number	Diff line number	Diff line
		@@ -542,11 +542,9 @@ X_OBJS= \
		$(DIROBJ)\curl_multibyte.obj \
		$(DIROBJ)\curl_ntlm.obj \
		$(DIROBJ)\curl_ntlm_core.obj \
		$(DIROBJ)\curl_ntlm_msgs.obj \
		$(DIROBJ)\curl_ntlm_wb.obj \
		$(DIROBJ)\curl_rtmp.obj \
		$(DIROBJ)\curl_sasl.obj \
		$(DIROBJ)\curl_sasl_sspi.obj \
		$(DIROBJ)\curl_sspi.obj \
		$(DIROBJ)\curl_threads.obj \
		$(DIROBJ)\cyassl.obj \
		@@ -626,6 +624,8 @@ X_OBJS= \
		$(DIROBJ)\digest_sspi.obj \
		$(DIROBJ)\krb5_gssapi.obj \
		$(DIROBJ)\krb5_sspi.obj \
		$(DIROBJ)\ntlm.obj \
		$(DIROBJ)\ntlm_sspi.obj \
		$(DIROBJ)\vtls.obj \
		$(DIROBJ)\openssl.obj \
		$(DIROBJ)\strdup.obj \

lib/curl_ntlm.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -37,9 +37,8 @@
		#include "sendf.h"
		#include "rawstr.h"
		#include "curl_ntlm.h"
		#include "curl_ntlm_msgs.h"
		#include "curl_ntlm_wb.h"
		#include "curl_sasl.h"
		#include "vauth/vauth.h"
		#include "url.h"
		#include "curl_printf.h"

lib/curl_ntlm_wb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		@@ -47,7 +47,7 @@
		#include "urldata.h"
		#include "sendf.h"
		#include "select.h"
		#include "curl_ntlm_msgs.h"
		#include "vauth/ntlm.h"
		#include "curl_ntlm_wb.h"
		#include "url.h"
		#include "strerror.h"

lib/curl_sasl.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -70,27 +70,6 @@ const struct {
		{ ZERO_NULL, 0, 0 }
		};

		#if defined(USE_NTLM) && !defined(USE_WINDOWS_SSPI)
		/*
		* Curl_sasl_ntlm_cleanup()
		*
		* This is used to clean up the NTLM specific data.
		*
		* Parameters:
		*
		* ntlm [in/out] - The NTLM data struct being cleaned up.
		*
		*/
		void Curl_sasl_ntlm_cleanup(struct ntlmdata *ntlm)
		{
		/* Free the target info */
		Curl_safefree(ntlm->target_info);

		/* Reset any variables */
		ntlm->target_info_len = 0;
		}
		#endif /* USE_NTLM && !USE_WINDOWS_SSPI*/

		/*
		* sasl_create_oauth_bearer_message()
		*

Admin message