generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More DES library cleanups: remove references to srand/rand

Browse Source 
and delete an unused file.
This commit is contained in:
Ulf Möller 1999-07-15 23:47:02 +00:00
parent 4f6235f701
commit cfa3747ba9
7 changed files with 6 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/bn/bntest.c
View File

@ -104,8 +104,6 @@ int main(int argc, char *argv[])
BIO *out; BIO *out;
char *outfile=NULL; char *outfile=NULL;
srand((unsigned int)time(NULL));
argc--; argc--;
argv++; argv++;
while (argc >= 1) while (argc >= 1)

16
crypto/des/des.c
View File

@ -65,17 +65,12 @@
#else /* VMS */ #else /* VMS */
#ifdef __DECC #ifdef __DECC
#include <unistd.h> #include <unistd.h>
#if __CRTL_VER < 70000000
#define RAND
#endif
#else /* not __DECC */ #else /* not __DECC */
#include <math.h> #include <math.h>
#define RAND
#endif /* __DECC */ #endif /* __DECC */
#endif /* VMS */ #endif /* VMS */
#else #else
#include <io.h> #include <io.h>
#define RAND
#endif #endif
#include <time.h> #include <time.h>
@ -91,16 +86,12 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#include <openssl/des.h> #include <openssl/des.h>
#include <openssl/rand.h>
#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS) #if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
#include <string.h> #include <string.h>
#endif #endif
#ifdef RAND
#define random rand
#define srandom(s) srand(s)
#endif
void usage(void); void usage(void);
void doencryption(void); void doencryption(void);
int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp); int uufwrite(unsigned char *data, int size, unsigned int num, FILE *fp);
@ -368,8 +359,6 @@ NULL
void doencryption(void) void doencryption(void)
{ {
#ifdef _LIBC #ifdef _LIBC
extern int srandom();
extern int random();
extern unsigned long time(); extern unsigned long time();
#endif #endif
@ -494,9 +483,8 @@ void doencryption(void)
len=l-rem; len=l-rem;
if (feof(DES_IN)) if (feof(DES_IN))
{ {
srandom((unsigned int)time(NULL));
for (i=7-rem; i>0; i--) for (i=7-rem; i>0; i--)
buf[l++]=random()&0xff; RAND_bytes(buf + l++, 1);
buf[l++]=rem; buf[l++]=rem;
ex=1; ex=1;
len+=rem; len+=rem;

2
crypto/des/des_enc.c
View File

@ -290,7 +290,7 @@ void des_decrypt3(DES_LONG *data, des_key_schedule ks1, des_key_schedule ks2,
#ifndef DES_DEFAULT_OPTIONS #ifndef DES_DEFAULT_OPTIONS
#undef CBC_ENC_C__DONT_UPDATE_IV #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, void des_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
long length, des_key_schedule ks1, des_key_schedule ks2, long length, des_key_schedule ks1, des_key_schedule ks2,

33
crypto/des/des_locl.h
View File

@ -73,6 +73,7 @@
#ifndef MSDOS #ifndef MSDOS
#if !defined(VMS) || defined(__DECC) #if !defined(VMS) || defined(__DECC)
#include OPENSSL_UNISTD #include OPENSSL_UNISTD
#include <math.h>
#endif #endif
#endif #endif
#include <openssl/des.h> #include <openssl/des.h>
@ -82,44 +83,12 @@
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <io.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 #endif
#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS) #if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
#include <string.h> #include <string.h>
#endif #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 ITERATIONS 16
#define HALF_ITERATIONS 8 #define HALF_ITERATIONS 8

179
crypto/des/ede_enc.c
View File

@ -1,179 +0,0 @@
/* 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

7
crypto/des/enc_writ.c
View File

@ -61,6 +61,7 @@
#include <stdio.h> #include <stdio.h>
#include "cryptlib.h" #include "cryptlib.h"
#include "des_locl.h" #include "des_locl.h"
#include <openssl/rand.h>
/* /*
* WARNINGS: * WARNINGS:
@ -80,9 +81,7 @@ int des_enc_write(int fd, const void *_buf, int len,
des_key_schedule sched, des_cblock *iv) des_key_schedule sched, des_cblock *iv)
{ {
#ifdef _LIBC #ifdef _LIBC
extern int srandom();
extern unsigned long time(); extern unsigned long time();
extern int random();
extern int write(); extern int write();
#endif #endif
const unsigned char *buf=_buf; const unsigned char *buf=_buf;
@ -104,7 +103,6 @@ int des_enc_write(int fd, const void *_buf, int len,
if (start) if (start)
{ {
start=0; start=0;
srandom(time(NULL));
} }
/* lets recurse if we want to send the data in small chunks */ /* lets recurse if we want to send the data in small chunks */
@ -132,8 +130,7 @@ int des_enc_write(int fd, const void *_buf, int len,
{ {
cp=shortbuf; cp=shortbuf;
memcpy(shortbuf,buf,len); memcpy(shortbuf,buf,len);
for (i=len; i<8; i++) RAND_bytes(shortbuf+len, 8-len);
shortbuf[i]=random();
rnum=8; rnum=8;
} }
else else

4
crypto/des/read_pwd.c
View File

@ -188,11 +188,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty);
#ifdef SIGACTION #ifdef SIGACTION
static struct sigaction savsig[NX509_SIG]; static struct sigaction savsig[NX509_SIG];
#else #else
# ifndef NOPROTO
static void (*savsig[NX509_SIG])(int ); static void (*savsig[NX509_SIG])(int );
# else
static void (*savsig[NX509_SIG])();
# endif
#endif #endif
static jmp_buf save; static jmp_buf save;