Deal with generated files. (8d7ed6ff) · Commits · CYBER - Cyber Security / TS 103 523 MSP / ETS / ETS OpenSSL

CHANGES

+7 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,13 @@
		sco5-cc.
		[Ben Laurie]

		*) Eliminate generated files from CVS. Reorder tests to regenerate files
		before they are needed.
		[Ben Laurie]

		*) Generate Makefile.ssl from Makefile.org (to keep CVS happy).
		[Ben Laurie]

		Changes between 0.9.1b and 0.9.1c

		*) Added OPENSSL_VERSION_NUMBER to crypto/crypto.h and

Configure

+1 −1

Original line number	Diff line number	Diff line
		@@ -327,7 +327,7 @@ if ($rmd160_obj =~ /\.o$/)
		}

		my $n=&file_new($Makefile);
		open(IN,"<".$Makefile) \|\| die "unable to read $Makefile:$!\n";
		open(IN,'<Makefile.org') \|\| die "unable to read $Makefile:$!\n";
		open(OUT,">".$n) \|\| die "unable to read $n:$!\n";
		while (<IN>)
		{

Makefile.ssl→Makefile.org

+11 −11

Original line number	Diff line number	Diff line
		#
		# Makefile for all the SSL related library routines and utilities
		VERSION = 0.9.1c
		PLATFORM=dist
		PLATFORM=FreeBSD
		#
		# make install will install:
		# libraries into $INSTALLTOP/lib
		@@ -62,9 +62,9 @@ PLATFORM=dist
		# equal 4.
		# PKCS1_CHECK - pkcs1 tests.

		CC= cc
		CC= gcc
		#CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
		CFLAG= -O -DNOPROTO
		CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
		PEX_LIBS= -L. -L.. -L../.. -L../../..
		EX_LIBS=
		AR=ar r
		@@ -86,7 +86,7 @@ BN_ASM= bn_asm.o

		# Set DES_ENC to des_enc.o if you want to use the C version
		#There are 4 x86 assember options.
		DES_ENC= des_enc.o fcrypt_b.o
		DES_ENC= asm/dx86-out.o asm/yx86-out.o
		#DES_ENC= des_enc.o fcrypt_b.o # C
		#DES_ENC= asm/dx86-elf.o asm/yx86-elf.o # elf
		#DES_ENC= asm/dx86-sol.o asm/yx86-sol.o # solaris
		@@ -95,7 +95,7 @@ DES_ENC= des_enc.o fcrypt_b.o

		# Set BF_ENC to bf_enc.o if you want to use the C version
		#There are 4 x86 assember options.
		BF_ENC= bf_enc.o
		BF_ENC= asm/bx86-out.o
		#BF_ENC= bf_enc.o
		#BF_ENC= asm/bx86-elf.o # elf
		#BF_ENC= asm/bx86-sol.o # solaris
		@@ -104,7 +104,7 @@ BF_ENC= bf_enc.o

		# Set CAST_ENC to c_enc.o if you want to use the C version
		#There are 4 x86 assember options.
		CAST_ENC= c_enc.o
		CAST_ENC= asm/cx86-out.o
		#CAST_ENC= c_enc.o
		#CAST_ENC= asm/cx86-elf.o # elf
		#CAST_ENC= asm/cx86-sol.o # solaris
		@@ -113,7 +113,7 @@ CAST_ENC= c_enc.o

		# Set RC4_ENC to rc4_enc.o if you want to use the C version
		#There are 4 x86 assember options.
		RC4_ENC= rc4_enc.o
		RC4_ENC= asm/rx86-out.o
		#RC4_ENC= rc4_enc.o
		#RC4_ENC= asm/rx86-elf.o # elf
		#RC4_ENC= asm/rx86-sol.o # solaris
		@@ -122,7 +122,7 @@ RC4_ENC= rc4_enc.o

		# Set RC5_ENC to rc5_enc.o if you want to use the C version
		#There are 4 x86 assember options.
		RC5_ENC= rc5_enc.o
		RC5_ENC= asm/r586-out.o
		#RC5_ENC= rc5_enc.o
		#RC5_ENC= asm/r586-elf.o # elf
		#RC5_ENC= asm/r586-sol.o # solaris
		@@ -130,21 +130,21 @@ RC5_ENC= rc5_enc.o
		#RC5_ENC= asm/r586bsdi.o # bsdi

		# Also need MD5_ASM defined
		MD5_ASM_OBJ=
		MD5_ASM_OBJ= asm/mx86-out.o
		#MD5_ASM_OBJ= asm/mx86-elf.o # elf
		#MD5_ASM_OBJ= asm/mx86-sol.o # solaris
		#MD5_ASM_OBJ= asm/mx86-out.o # a.out, FreeBSD
		#MD5_ASM_OBJ= asm/mx86bsdi.o # bsdi

		# Also need SHA1_ASM defined
		SHA1_ASM_OBJ=
		SHA1_ASM_OBJ= asm/sx86-out.o
		#SHA1_ASM_OBJ= asm/sx86-elf.o # elf
		#SHA1_ASM_OBJ= asm/sx86-sol.o # solaris
		#SHA1_ASM_OBJ= asm/sx86-out.o # a.out, FreeBSD
		#SHA1_ASM_OBJ= asm/sx86bsdi.o # bsdi

		# Also need RMD160_ASM defined
		RMD160_ASM_OBJ=
		RMD160_ASM_OBJ= asm/rm86-out.o
		#RMD160_ASM_OBJ= asm/rm86-elf.o # elf
		#RMD160_ASM_OBJ= asm/rm86-sol.o # solaris
		#RMD160_ASM_OBJ= asm/rm86-out.o # a.out, FreeBSD

crypto/bf/bf_locl.h

deleted100644 → 0

+0 −242

Original line number	Diff line number	Diff line
		/* crypto/bf/bf_locl.org */
		/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
		* All rights reserved.
		*
		* This package is an SSL implementation written
		* by Eric Young (eay@cryptsoft.com).
		* The implementation was written so as to conform with Netscapes SSL.
		*
		* This library is free for commercial and non-commercial use as long as
		* the following conditions are aheared to. The following conditions
		* apply to all code found in this distribution, be it the RC4, RSA,
		* lhash, DES, etc., code; not just the SSL code. The SSL documentation
		* included with this distribution is covered by the same copyright terms
		* except that the holder is Tim Hudson (tjh@cryptsoft.com).
		*
		* Copyright remains Eric Young's, and as such any Copyright notices in
		* the code are not to be removed.
		* If this package is used in a product, Eric Young should be given attribution
		* as the author of the parts of the library used.
		* This can be in the form of a textual message at program startup or
		* in documentation (online or textual) provided with the package.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		* 1. Redistributions of source code must retain the copyright
		* notice, this list of conditions and the following disclaimer.
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in the
		* documentation and/or other materials provided with the distribution.
		* 3. All advertising materials mentioning features or use of this software
		* must display the following acknowledgement:
		* "This product includes cryptographic software written by
		* Eric Young (eay@cryptsoft.com)"
		* The word 'cryptographic' can be left out if the rouines from the library
		* being used are not cryptographic related :-).
		* 4. If you include any Windows specific code (or a derivative thereof) from
		* the apps directory (application code) you must include an acknowledgement:
		* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
		*
		* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
		* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
		* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
		* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
		* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE.
		*
		* The licence and distribution terms for any publically available version or
		* derivative of this code cannot be changed. i.e. this code cannot simply be
		* copied and put under another distribution licence
		* [including the GNU Public Licence.]
		*/

		/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
		*
		* Always modify bf_locl.org since bf_locl.h is automatically generated from
		* it during SSLeay configuration.
		*
		* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
		*/

		/* Special defines which change the way the code is built depending on the
		CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
		even newer MIPS CPU's, but at the moment one size fits all for
		optimization options. Older Sparc's work better with only UNROLL, but
		there's no way to tell at compile time what it is you're running on */

		#if defined( sun ) /* Newer Sparc's */
		# define BF_PTR
		#elif defined( __ultrix ) /* Older MIPS */
		# define BF_PTR
		#elif defined( __osf1__ ) /* Alpha */
		/* None */
		#elif defined ( _AIX ) /* RS6000 */
		/* Unknown */
		#elif defined( __hpux ) /* HP-PA */
		/* None */
		#elif defined( __aux ) /* 68K */
		/* Unknown */
		#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
		/* Unknown */
		#elif defined( __sgi ) /* Newer MIPS */
		# define BF_PTR
		#elif defined( i386 ) /* x86 boxes, should be gcc */
		#elif defined( _MSC_VER ) /* x86 boxes, Visual C */
		#endif /* Systems-specific speed defines */

		#undef c2l
		#define c2l(c,l) (l =((unsigned long)(*((c)++))) , \
		l\|=((unsigned long)(*((c)++)))<< 8L, \
		l\|=((unsigned long)(*((c)++)))<<16L, \
		l\|=((unsigned long)(*((c)++)))<<24L)

		/* NOTE - c is not incremented as per c2l */
		#undef c2ln
		#define c2ln(c,l1,l2,n) { \
		c+=n; \
		l1=l2=0; \
		switch (n) { \
		case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
		case 7: l2\|=((unsigned long)(*(--(c))))<<16L; \
		case 6: l2\|=((unsigned long)(*(--(c))))<< 8L; \
		case 5: l2\|=((unsigned long)(*(--(c)))); \
		case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
		case 3: l1\|=((unsigned long)(*(--(c))))<<16L; \
		case 2: l1\|=((unsigned long)(*(--(c))))<< 8L; \
		case 1: l1\|=((unsigned long)(*(--(c)))); \
		} \
		}

		#undef l2c
		#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
		*((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
		*((c)++)=(unsigned char)(((l)>>16L)&0xff), \
		*((c)++)=(unsigned char)(((l)>>24L)&0xff))

		/* NOTE - c is not incremented as per l2c */
		#undef l2cn
		#define l2cn(l1,l2,c,n) { \
		c+=n; \
		switch (n) { \
		case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
		case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
		case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
		case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \
		case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
		case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
		case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
		case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \
		} \
		}

		/* NOTE - c is not incremented as per n2l */
		#define n2ln(c,l1,l2,n) { \
		c+=n; \
		l1=l2=0; \
		switch (n) { \
		case 8: l2 =((unsigned long)(*(--(c)))) ; \
		case 7: l2\|=((unsigned long)(*(--(c))))<< 8; \
		case 6: l2\|=((unsigned long)(*(--(c))))<<16; \
		case 5: l2\|=((unsigned long)(*(--(c))))<<24; \
		case 4: l1 =((unsigned long)(*(--(c)))) ; \
		case 3: l1\|=((unsigned long)(*(--(c))))<< 8; \
		case 2: l1\|=((unsigned long)(*(--(c))))<<16; \
		case 1: l1\|=((unsigned long)(*(--(c))))<<24; \
		} \
		}

		/* NOTE - c is not incremented as per l2n */
		#define l2nn(l1,l2,c,n) { \
		c+=n; \
		switch (n) { \
		case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \
		case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
		case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
		case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
		case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \
		case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
		case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
		case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
		} \
		}

		#undef n2l
		#define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \
		l\|=((unsigned long)(*((c)++)))<<16L, \
		l\|=((unsigned long)(*((c)++)))<< 8L, \
		l\|=((unsigned long)(*((c)++))))

		#undef l2n
		#define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
		*((c)++)=(unsigned char)(((l)>>16L)&0xff), \
		*((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
		*((c)++)=(unsigned char)(((l) )&0xff))

		/* This is actually a big endian algorithm, the most significate byte
		* is used to lookup array 0 */

		/* use BF_PTR2 for intel boxes,
		* BF_PTR for sparc and MIPS/SGI
		* use nothing for Alpha and HP.
		*/
		#if !defined(BF_PTR) && !defined(BF_PTR2)
		#undef BF_PTR
		#endif

		#define BF_M 0x3fc
		#define BF_0 22L
		#define BF_1 14L
		#define BF_2 6L
		#define BF_3 2L /* left shift */

		#if defined(BF_PTR2)

		/* This is basically a special pentium verson */
		#define BF_ENC(LL,R,S,P) \
		{ \
		BF_LONG t,u,v; \
		u=R>>BF_0; \
		v=R>>BF_1; \
		u&=BF_M; \
		v&=BF_M; \
		t= (BF_LONG )((unsigned char *)&(S[ 0])+u); \
		u=R>>BF_2; \
		t+= (BF_LONG )((unsigned char *)&(S[256])+v); \
		v=R<<BF_3; \
		u&=BF_M; \
		v&=BF_M; \
		t^= (BF_LONG )((unsigned char *)&(S[512])+u); \
		LL^=P; \
		t+= (BF_LONG )((unsigned char *)&(S[768])+v); \
		LL^=t; \
		}

		#elif defined(BF_PTR)

		/* This is normally very good */

		#define BF_ENC(LL,R,S,P) \
		LL^=P; \
		LL^= ((((BF_LONG )((unsigned char *)&(S[ 0])+((R>>BF_0)&BF_M))+ \
		(BF_LONG )((unsigned char *)&(S[256])+((R>>BF_1)&BF_M)))^ \
		(BF_LONG )((unsigned char *)&(S[512])+((R>>BF_2)&BF_M)))+ \
		(BF_LONG )((unsigned char *)&(S[768])+((R<<BF_3)&BF_M)));
		#else

		/* This will always work, even on 64 bit machines and strangly enough,
		* on the Alpha it is faster than the pointer versions (both 32 and 64
		* versions of BF_LONG) */

		#define BF_ENC(LL,R,S,P) \
		LL^=P; \
		LL^=((( S[ (int)(R>>24L) ] + \
		S[0x0100+((int)(R>>16L)&0xff)])^ \
		S[0x0200+((int)(R>> 8L)&0xff)])+ \
		S[0x0300+((int)(R )&0xff)])&0xffffffffL;
		#endif

crypto/bn/bn.h

deleted100644 → 0

+0 −599

File deleted.

Preview size limit exceeded, changes collapsed.