NTLM2 session response support (2bd3033f) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

CHANGES

+4 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,10 @@

		Changelog

		Daniel (7 June 2006)
		- Mikael Sennerholm provided a patch that added NTLM2 session response support
		to libcurl. The 21 NTLM test cases were again modified to comply...

		Daniel (27 May 2006)
		- Óscar Morales Vivó updated the libcurl.framework.make file.

RELEASE-NOTES

+11 −6

Original line number	Diff line number	Diff line
		@@ -5,12 +5,13 @@ Curl and libcurl 7.15.4
		Available command line options: 112
		Available curl_easy_setopt() options: 132
		Number of public functions in libcurl: 49
		Amount of public web site mirrors: 32
		Amount of public web site mirrors: 33
		Number of known libcurl bindings: 32
		Number of contributors: 492

		This release includes the following changes:

		o NTLM2 session response support
		o CURLOPT_COOKIELIST set to "SESS" clears all session cookies
		o CURLINFO_LASTSOCKET returned sockets are now checked more before returned
		o curl-config got a --checkfor option to compare version numbers
		@@ -46,13 +47,17 @@ This release includes the following bugfixes:
		o TFTP transfers could trash data
		o -d + -G combo crash

		Other curl-related news since the previous public release:
		Other curl-related news:

		o http://curl.de-mirror.de/ is a new mirror in Aachen, Germany
		o http://curl.osmirror.nl/ is a new mirror in Amsterdam, the Netherlands
		o tclcurl 0.15.3 was released:
		http://personal1.iddeo.es/andresgarci/tclcurl/english/
		o http://curl.usphp.com/ is a new mirror in Florida, US

		New curl mirrors:

		o http://curl.webdesign-zdg.de/ in Frankfurt, Germany
		o http://curl.de-mirror.de/ in Aachen, Germany
		o http://curl.osmirror.nl/ in Amsterdam, the Netherlands
		o http://curl.usphp.com/ in Florida, US

		This release would not have looked like this without help, code, reports and
		advice from friends like these:
		@@ -60,6 +65,6 @@ advice from friends like these:
		Dan Fandrich, Ilja van Sprundel, David McCreedy, Tor Arntsen, Xavier Bouchoux,
		David Byron, Michele Bini, Ates Goral, Katie Wang, Robson Braga Araujo,
		Ale Vesely, Paul Querna, Gisle Vanem, Mark Eichin, Roland Blom, Andreas
		Ntaflos, David Shaw, Michael Wallner, Olaf Stben
		Ntaflos, David Shaw, Michael Wallner, Olaf Stben, Mikael Sennerholm

		Thanks! (and sorry if I forgot to mention someone)

lib/http_ntlm.c

+51 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@
		#include "http_ntlm.h"
		#include "url.h"
		#include "memory.h"
		#include "ssluse.h"

		#define _MPRINTF_REPLACE /* use our functions only */
		#include <curl/mprintf.h>
		@@ -59,7 +60,9 @@

		#include <openssl/des.h>
		#include <openssl/md4.h>
		#include <openssl/md5.h>
		#include <openssl/ssl.h>
		#include <openssl/rand.h>

		#if OPENSSL_VERSION_NUMBER < 0x00907001L
		#define DES_key_schedule des_key_schedule
		@@ -94,6 +97,10 @@ static PSecurityFunctionTable s_pSecFn = NULL;
		/* Define this to make the type-3 message include the NT response message */
		#define USE_NTRESPONSES 1

		/* Define this to make the type-3 message include the NTLM2Session response
		message, requires USE_NTRESPONSES. */
		#define USE_NTLM2SESSION 1

		#ifndef USE_WINDOWS_SSPI
		/* this function converts from the little endian format used in the incoming
		package to whatever endian format we're using natively */
		@@ -630,7 +637,11 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
		32 start of data block

		*/

		#if USE_NTLM2SESSION
		#define NTLM2FLAG NTLMFLAG_NEGOTIATE_NTLM2_KEY
		#else
		#define NTLM2FLAG 0
		#endif
		snprintf((char *)ntlmbuf, sizeof(ntlmbuf), "NTLMSSP%c"
		"\x01%c%c%c" /* 32-bit type = 1 */
		"%c%c%c%c" /* 32-bit NTLM flag field */
		@@ -651,6 +662,7 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
		NTLMFLAG_NEGOTIATE_OEM\|
		NTLMFLAG_REQUEST_TARGET\|
		NTLMFLAG_NEGOTIATE_NTLM_KEY\|
		NTLM2FLAG\|
		NTLMFLAG_NEGOTIATE_ALWAYS_SIGN
		),
		SHORTPAIR(domlen),
		@@ -672,15 +684,18 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
		LONGQUARTET(NTLMFLAG_NEGOTIATE_OEM\|
		NTLMFLAG_REQUEST_TARGET\|
		NTLMFLAG_NEGOTIATE_NTLM_KEY\|
		NTLM2FLAG\|
		NTLMFLAG_NEGOTIATE_ALWAYS_SIGN),
		NTLMFLAG_NEGOTIATE_OEM\|
		NTLMFLAG_REQUEST_TARGET\|
		NTLMFLAG_NEGOTIATE_NTLM_KEY\|
		NTLM2FLAG\|
		NTLMFLAG_NEGOTIATE_ALWAYS_SIGN);
		print_flags(stderr,
		NTLMFLAG_NEGOTIATE_OEM\|
		NTLMFLAG_REQUEST_TARGET\|
		NTLMFLAG_NEGOTIATE_NTLM_KEY\|
		NTLM2FLAG\|
		NTLMFLAG_NEGOTIATE_ALWAYS_SIGN);
		fprintf(stderr, "\n****\n");
		});
		@@ -786,7 +801,41 @@ CURLcode Curl_output_ntlm(struct connectdata *conn,
		hostlen = strlen(host);
		}

		{
		#if USE_NTLM2SESSION
		/* We don't support NTLM2 if we don't have USE_NTRESPONSES */
		if (ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM2_KEY) {
		unsigned char ntbuffer[0x18];
		unsigned char tmp[0x18];
		unsigned char md5sum[MD5_DIGEST_LENGTH];
		MD5_CTX MD5;
		unsigned char random[8];

		/* Need to create 8 bytes random data */
		Curl_ossl_seed(conn->data); /* Initiate the seed if not already done */
		RAND_bytes(random,8);

		/* 8 bytes random data as challenge in lmresp */
		memcpy(lmresp,random,8);
		/* Pad with zeros */
		memset(lmresp+8,0,0x10);

		/* Fill tmp with challenge(nonce?) + random */
		memcpy(tmp,&ntlm->nonce[0],8);
		memcpy(tmp+8,random,8);

		MD5_Init(&MD5);
		MD5_Update(&MD5, tmp, 16);
		MD5_Final(md5sum, &MD5);
		/* We shall only use the first 8 bytes of md5sum,
		but the des code in lm_resp only encrypt the first 8 bytes */
		mk_nt_hash(passwdp, ntbuffer);
		lm_resp(ntbuffer, md5sum, ntresp);

		/* End of NTLM2 Session code */
		}
		else {
		#endif

		#if USE_NTRESPONSES
		unsigned char ntbuffer[0x18];
		#endif

lib/ssluse.c

+17 −11

Original line number	Diff line number	Diff line
		@@ -169,8 +169,7 @@ static bool rand_enough(int nread)
		}
		#endif

		static
		int random_the_seed(struct SessionHandle *data)
		static int ossl_seed(struct SessionHandle *data)
		{
		char buf = data->state.buffer; / point to the big buffer */
		int nread=0;
		@@ -259,6 +258,20 @@ int random_the_seed(struct SessionHandle *data)
		return nread;
		}

		int Curl_ossl_seed(struct SessionHandle *data)
		{
		/* we have the "SSL is seeded" boolean static to prevent multiple
		time-consuming seedings in vain */
		static bool ssl_seeded = FALSE;

		if(!ssl_seeded \|\| data->set.ssl.random_file \|\| data->set.ssl.egdsocket) {
		ossl_seed(data);
		ssl_seeded = TRUE;
		}
		return 0;
		}


		#ifndef SSL_FILETYPE_ENGINE
		#define SSL_FILETYPE_ENGINE 42
		#endif
		@@ -531,9 +544,6 @@ static char SSL_strerror(unsigned long error, char buf, size_t size)
		return (buf);
		}

		/* we have the "SSL is seeded" boolean global for the application to
		prevent multiple time-consuming seedings in vain */
		static bool ssl_seeded = FALSE;
		#endif /* USE_SSLEAY */

		#ifdef USE_SSLEAY
		@@ -1166,12 +1176,8 @@ Curl_ossl_connect_step1(struct connectdata *conn,

		curlassert(ssl_connect_1 == connssl->connecting_state);

		if(!ssl_seeded \|\| data->set.ssl.random_file \|\| data->set.ssl.egdsocket) {
		/* Make funny stuff to get random input */
		random_the_seed(data);

		ssl_seeded = TRUE;
		}
		Curl_ossl_seed(data);

		/* check to see if we've been told to use an explicit SSL/TLS version */
		switch(data->set.ssl.version) {

lib/ssluse.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2006, 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
		@@ -63,7 +63,7 @@ ssize_t Curl_ossl_recv(struct connectdata conn, / connection data */
		bool *wouldblock);

		size_t Curl_ossl_version(char *buffer, size_t size);

		int Curl_ossl_check_cxn(struct connectdata *cxn);
		int Curl_ossl_seed(struct SessionHandle *data);

		#endif