More DES library cleanups: remove references to srand/rand (cfa3747b) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/bn/bntest.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -104,8 +104,6 @@ int main(int argc, char *argv[])
		BIO *out;
		char *outfile=NULL;

		srand((unsigned int)time(NULL));

		argc--;
		argv++;
		while (argc >= 1)

crypto/des/des.c

+2 −14

Original line number	Diff line number	Diff line
		@@ -65,17 +65,12 @@
		#else /* VMS */
		#ifdef __DECC
		#include <unistd.h>
		#if __CRTL_VER < 70000000
		#define RAND
		#endif
		#else /* not __DECC */
		#include <math.h>
		#define RAND
		#endif /* __DECC */
		#endif /* VMS */
		#else
		#include <io.h>
		#define RAND
		#endif

		#include <time.h>
		@@ -91,16 +86,12 @@
		#include <sys/stat.h>
		#endif
		#include <openssl/des.h>
		#include <openssl/rand.h>

		#if defined(__STDC__) \|\| defined(VMS) \|\| defined(M_XENIX) \|\| defined(MSDOS)
		#include <string.h>
		#endif

		#ifdef RAND
		#define random rand
		#define srandom(s) srand(s)
		#endif

		void usage(void);
		void doencryption(void);
		int uufwrite(unsigned char data, int size, unsigned int num, FILE fp);
		@@ -368,8 +359,6 @@ NULL
		void doencryption(void)
		{
		#ifdef _LIBC
		extern int srandom();
		extern int random();
		extern unsigned long time();
		#endif

		@@ -494,9 +483,8 @@ void doencryption(void)
		len=l-rem;
		if (feof(DES_IN))
		{
		srandom((unsigned int)time(NULL));
		for (i=7-rem; i>0; i--)
		buf[l++]=random()&0xff;
		RAND_bytes(buf + l++, 1);
		buf[l++]=rem;
		ex=1;
		len+=rem;

crypto/des/des_enc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -290,7 +290,7 @@ void des_decrypt3(DES_LONG *data, des_key_schedule ks1, des_key_schedule ks2,
		#ifndef DES_DEFAULT_OPTIONS

		#undef CBC_ENC_C__DONT_UPDATE_IV
		#include "ncbc_enc.c" /* des_ncbc_enrypt */
		#include "ncbc_enc.c" /* des_ncbc_encrypt */

		void des_ede3_cbc_encrypt(const unsigned char input, unsigned char output,
		long length, des_key_schedule ks1, des_key_schedule ks2,

crypto/des/des_locl.h

+1 −32

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@
		#ifndef MSDOS
		#if !defined(VMS) \|\| defined(__DECC)
		#include OPENSSL_UNISTD
		#include <math.h>
		#endif
		#endif
		#include <openssl/des.h>
		@@ -82,44 +83,12 @@
		#include <errno.h>
		#include <time.h>
		#include <io.h>
		#ifndef RAND
		#define RAND
		#endif
		#endif

		#ifdef VMS
		#ifndef __DECC
		#include <math.h>
		#define RAND
		#else
		#if __CRTL_VER < 70000000
		#define RAND
		#endif
		#endif
		#endif

		#if defined(__STDC__) \|\| defined(VMS) \|\| defined(M_XENIX) \|\| defined(MSDOS)
		#include <string.h>
		#endif

		#ifndef RAND
		#define RAND
		#endif

		#ifdef linux
		#undef RAND
		#endif

		#ifdef MSDOS
		#define getpid() 2
		#define RAND
		#endif

		#ifdef RAND
		#define srandom(s) srand(s)
		#define random rand
		#endif

		#define ITERATIONS 16
		#define HALF_ITERATIONS 8

crypto/des/ede_enc.c

deleted100644 → 0

+0 −179

Original line number	Diff line number	Diff line
		/* crypto/des/ede_enc.c */
		/* Copyright (C) 1995-1998 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.]
		*/

		#include "des_locl.h"

		void des_ede3_cbc_encrypt(des_cblock (input), des_cblock (output),
		long length, des_key_schedule ks1, des_key_schedule ks2,
		des_key_schedule ks3, des_cblock (*ivec), int enc)
		{
		register DES_LONG tin0,tin1;
		register DES_LONG tout0,tout1,xor0,xor1;
		register unsigned char in,out;
		register long l=length;
		DES_LONG tin[2];
		unsigned char *iv;

		in=(unsigned char *)input;
		out=(unsigned char *)output;
		iv=(unsigned char *)ivec;

		if (enc)
		{
		c2l(iv,tout0);
		c2l(iv,tout1);
		for (l-=8; l>=0; l-=8)
		{
		c2l(in,tin0);
		c2l(in,tin1);
		tin0^=tout0;
		tin1^=tout1;

		tin[0]=tin0;
		tin[1]=tin1;
		des_encrypt3((DES_LONG *)tin,ks1,ks2,ks3);
		tout0=tin[0];
		tout1=tin[1];

		l2c(tout0,out);
		l2c(tout1,out);
		}
		if (l != -8)
		{
		c2ln(in,tin0,tin1,l+8);
		tin0^=tout0;
		tin1^=tout1;

		tin[0]=tin0;
		tin[1]=tin1;
		des_encrypt3((DES_LONG *)tin,ks1,ks2,ks3);
		tout0=tin[0];
		tout1=tin[1];

		l2c(tout0,out);
		l2c(tout1,out);
		}
		iv=(unsigned char *)ivec;
		l2c(tout0,iv);
		l2c(tout1,iv);
		}
		else
		{
		register DES_LONG t0,t1;

		c2l(iv,xor0);
		c2l(iv,xor1);
		for (l-=8; l>=0; l-=8)
		{
		c2l(in,tin0);
		c2l(in,tin1);

		t0=tin0;
		t1=tin1;

		tin[0]=tin0;
		tin[1]=tin1;
		des_decrypt3((DES_LONG *)tin,ks1,ks2,ks3);
		tout0=tin[0];
		tout1=tin[1];

		tout0^=xor0;
		tout1^=xor1;
		l2c(tout0,out);
		l2c(tout1,out);
		xor0=t0;
		xor1=t1;
		}
		if (l != -8)
		{
		c2l(in,tin0);
		c2l(in,tin1);

		t0=tin0;
		t1=tin1;

		tin[0]=tin0;
		tin[1]=tin1;
		des_decrypt3((DES_LONG *)tin,ks1,ks2,ks3);
		tout0=tin[0];
		tout1=tin[1];

		tout0^=xor0;
		tout1^=xor1;
		l2cn(tout0,tout1,out,l+8);
		xor0=t0;
		xor1=t1;
		}

		iv=(unsigned char *)ivec;
		l2c(xor0,iv);
		l2c(xor1,iv);
		}
		tin0=tin1=tout0=tout1=xor0=xor1=0;
		tin[0]=tin[1]=0;
		}

		#ifdef undef /* MACRO */
		void des_ede2_cbc_encrypt(des_cblock (input), des_cblock (output),
		long length, des_key_schedule ks1, des_key_schedule ks2,
		des_cblock (*ivec), int enc)
		{
		des_ede3_cbc_encrypt(input,output,length,ks1,ks2,ks1,ivec,enc);
		}
		#endif