des: Added Curl_des_set_odd_parity() (300876a7) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.inc

+4 −3

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		# \| (__\| \|_\| \| _ <\| \|___
		# \___\|\___/\|_\| \_\_____\|
		#
		# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
		# Copyright (C) 1998 - 2015, 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
		@@ -45,7 +45,8 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.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 bundles.c conncache.c pipeline.c dotdot.c x509asn1.c \
		http2.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.c curl_endian.c
		http2.c curl_sasl_sspi.c smb.c curl_sasl_gssapi.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 \
		@@ -63,7 +64,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.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 bundles.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
		dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h

		LIB_RCFILES = libcurl.rc

lib/Makefile.vc6

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		# \| (__\| \|_\| \| _ <\| \|___
		# \___\|\___/\|_\| \_\_____\|
		#
		# Copyright (C) 1999 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
		# Copyright (C) 1999 - 2015, 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
		@@ -535,6 +535,7 @@ X_OBJS= \
		$(DIROBJ)\cookie.obj \
		$(DIROBJ)\curl_addrinfo.obj \
		$(DIROBJ)\curl_darwinssl.obj \
		$(DIROBJ)\curl_des.obj \
		$(DIROBJ)\curl_endian.obj \
		$(DIROBJ)\curl_fnmatch.obj \
		$(DIROBJ)\curl_gethostname.obj \

lib/curl_des.c

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/***************************************************************************
		* _ _ ____ _
		* Project ___\| \| \| \| _ \\| \|
		* / __\| \| \| \| \|_) \| \|
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 2015, Steve Holme, <steve_holme@hotmail.com>.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		* are also available at http://curl.haxx.se/docs/copyright.html.
		*
		* You may opt to use, copy, modify, merge, publish, distribute and/or sell
		* copies of the Software, and permit persons to whom the Software is
		* furnished to do so, under the terms of the COPYING file.
		*
		* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
		* KIND, either express or implied.
		*
		***************************************************************************/

		#include "curl_setup.h"

		#if defined(USE_NTLM) && (!defined(USE_SSLEAY) \|\| defined(HAVE_BORINGSSL))

		#include "curl_des.h"

		/*
		* Curl_des_set_odd_parity()
		*
		* This is used to apply odd parity to the given byte array. It is typically
		* used by when a cryptography engines doesn't have it's own version.
		*
		* The function is a port of the Java based oddParity() function over at:
		*
		* http://davenport.sourceforge.net/ntlm.html
		*
		* Parameters:
		*
		* bytes [in/out] - The data whose parity bits are to be adjusted for
		* odd parity.
		* len [out] - The length of the data.
		*/
		void Curl_des_set_odd_parity(unsigned char *bytes, size_t len)
		{
		size_t i;

		for(i = 0; i < len; i++) {
		unsigned char b = bytes[i];

		bool needs_parity = (((b >> 7) ^ (b >> 6) ^ (b >> 5) ^
		(b >> 4) ^ (b >> 3) ^ (b >> 2) ^
		(b >> 1)) & 0x01) == 0;

		if(needs_parity)
		bytes[i] \|= 0x01;
		else
		bytes[i] &= 0xfe;
		}
		}

		#endif /* USE_NTLM && (!USE_SSLEAY \|\| HAVE_BORINGSSL) */

lib/curl_des.h

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		#ifndef HEADER_CURL_DES_H
		#define HEADER_CURL_DES_H
		/***************************************************************************
		* _ _ ____ _
		* Project ___\| \| \| \| _ \\| \|
		* / __\| \| \| \| \|_) \| \|
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 2015, Steve Holme, <steve_holme@hotmail.com>.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		* are also available at http://curl.haxx.se/docs/copyright.html.
		*
		* You may opt to use, copy, modify, merge, publish, distribute and/or sell
		* copies of the Software, and permit persons to whom the Software is
		* furnished to do so, under the terms of the COPYING file.
		*
		* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
		* KIND, either express or implied.
		*
		***************************************************************************/

		#include "curl_setup.h"

		#if defined(USE_NTLM) && (!defined(USE_SSLEAY) \|\| defined(HAVE_BORINGSSL))

		/* Applies odd parity to the given byte array */
		void Curl_des_set_odd_parity(unsigned char *bytes, size_t length);

		#endif /* USE_NTLM && (!USE_SSLEAY \|\| HAVE_BORINGSSL) */

		#endif /* HEADER_CURL_DES_H */

packages/Symbian/group/libcurl.mmp

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ SOURCE \
		curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c \
		curl_sasl.c vtls/curl_schannel.c curl_multibyte.c \
		vtls/curl_darwinssl.c bundles.c conncache.c curl_sasl_sspi.c smb.c \
		curl_sasl_gssapi.c curl_endian.c
		curl_sasl_gssapi.c curl_endian.c curl_des.c

		USERINCLUDE ../../../lib ../../../include/curl
		#ifdef ENABLE_SSL

Admin message