From cb145b995bb7d8afedb4acefc828e23617563d1c Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Wed, 21 Apr 1999 13:25:40 +0000 Subject: [PATCH] Remove some unnecessary(?) casting. --- crypto/des/enc_read.c | 18 +++++++++--------- crypto/des/enc_writ.c | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/crypto/des/enc_read.c b/crypto/des/enc_read.c index ed0f8f059d..23768daeef 100644 --- a/crypto/des/enc_read.c +++ b/crypto/des/enc_read.c @@ -103,17 +103,17 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched, if (tmpbuf == NULL) { - tmpbuf=(unsigned char *)Malloc(BSIZE); + tmpbuf=Malloc(BSIZE); if (tmpbuf == NULL) return(-1); } if (net == NULL) { - net=(unsigned char *)Malloc(BSIZE); + net=Malloc(BSIZE); if (net == NULL) return(-1); } if (unnet == NULL) { - unnet=(unsigned char *)Malloc(BSIZE); + unnet=Malloc(BSIZE); if (unnet == NULL) return(-1); } /* left over data from last decrypt */ @@ -147,7 +147,7 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched, /* first - get the length */ while (net_num < HDRSIZE) { - i=read(fd,&(net[net_num]),(unsigned int)HDRSIZE-net_num); + i=read(fd,&(net[net_num]),HDRSIZE-net_num); #ifdef EINTR if ((i == -1) && (errno == EINTR)) continue; #endif @@ -169,7 +169,7 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched, net_num=0; while (net_num < rnum) { - i=read(fd,&(net[net_num]),(unsigned int)rnum-net_num); + i=read(fd,&(net[net_num]),rnum-net_num); #ifdef EINTR if ((i == -1) && (errno == EINTR)) continue; #endif @@ -216,11 +216,11 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched, else { if (des_rw_mode & DES_PCBC_MODE) - des_pcbc_encrypt(net,(unsigned char*)buf,num, - sched,iv,DES_DECRYPT); + des_pcbc_encrypt(net,buf,num,sched,iv, + DES_DECRYPT); else - des_cbc_encrypt(net,(unsigned char*)buf,num, - sched,iv,DES_DECRYPT); + des_cbc_encrypt(net,buf,num,sched,iv, + DES_DECRYPT); } } return((int)num); diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c index 6690ff61d7..c2b407408b 100644 --- a/crypto/des/enc_writ.c +++ b/crypto/des/enc_writ.c @@ -96,7 +96,7 @@ int des_enc_write(int fd, const char *buf, int len, des_key_schedule sched, if (outbuf == NULL) { - outbuf=(unsigned char *)Malloc(BSIZE+HDRSIZE); + outbuf=Malloc(BSIZE+HDRSIZE); if (outbuf == NULL) return(-1); } /* If we are sending less than 8 bytes, the same char will look @@ -104,7 +104,7 @@ int des_enc_write(int fd, const char *buf, int len, des_key_schedule sched, if (start) { start=0; - srandom((unsigned int)time(NULL)); + srandom(time(NULL)); } /* lets recurse if we want to send the data in small chunks */ @@ -131,7 +131,7 @@ int des_enc_write(int fd, const char *buf, int len, des_key_schedule sched, if (len < 8) { cp=shortbuf; - memcpy(shortbuf,buf,(unsigned int)len); + memcpy(shortbuf,buf,len); for (i=len; i<8; i++) shortbuf[i]=random(); rnum=8; @@ -150,13 +150,13 @@ int des_enc_write(int fd, const char *buf, int len, des_key_schedule sched, DES_ENCRYPT); /* output */ - outnum=(int)rnum+HDRSIZE; + outnum=rnum+HDRSIZE; for (j=0; j