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

Warnings and casts.

Browse Source
This commit is contained in:
Ulf Möller 1999-06-08 16:17:25 +00:00
parent 93fd0fd61f
commit f947eb318e
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
crypto/des/des.c
View File

@ -374,7 +374,7 @@ void doencryption(void)
register int i; register int i;
des_key_schedule ks,ks2; des_key_schedule ks,ks2;
unsigned char iv[8],iv2[8]; des_cblock iv,iv2;
char *p; char *p;
int num=0,j,k,l,rem,ll,len,last,ex=0; int num=0,j,k,l,rem,ll,len,last,ex=0;
des_cblock kk,k2; des_cblock kk,k2;
@ -387,8 +387,8 @@ void doencryption(void)
if (buf == NULL) if (buf == NULL)
{ {
if ( (( buf=(unsigned char *)Malloc(BUFSIZE+8)) == NULL) || if ( (( buf=Malloc(BUFSIZE+8)) == NULL) ||
((obuf=(unsigned char *)Malloc(BUFSIZE+8)) == NULL)) ((obuf=Malloc(BUFSIZE+8)) == NULL))
{ {
fputs("Not enough memory\n",stderr); fputs("Not enough memory\n",stderr);
Exit=10; Exit=10;
@ -435,19 +435,19 @@ void doencryption(void)
else else
k2[i-8]=k; k2[i-8]=k;
} }
des_set_key((C_Block *)k2,ks2); des_set_key(&k2,ks2);
memset(k2,0,sizeof(k2)); memset(k2,0,sizeof(k2));
} }
else if (longk || flag3) else if (longk || flag3)
{ {
if (flag3) if (flag3)
{ {
des_string_to_2keys(key,(C_Block *)kk,(C_Block *)k2); des_string_to_2keys(key,&kk,&k2);
des_set_key((C_Block *)k2,ks2); des_set_key(&k2,ks2);
memset(k2,0,sizeof(k2)); memset(k2,0,sizeof(k2));
} }
else else
des_string_to_key(key,(C_Block *)kk); des_string_to_key(key,&kk);
} }
else else
for (i=0; i<KEYSIZ; i++) for (i=0; i<KEYSIZ; i++)
@ -465,7 +465,7 @@ void doencryption(void)
kk[i]=key[i]|0x80; kk[i]=key[i]|0x80;
} }
des_set_key((C_Block *)kk,ks); des_set_key(&kk,ks);
memset(key,0,sizeof(key)); memset(key,0,sizeof(key));
memset(kk,0,sizeof(kk)); memset(kk,0,sizeof(kk));
/* woops - A bug that does not showup under unix :-( */ /* woops - A bug that does not showup under unix :-( */
@ -505,8 +505,8 @@ void doencryption(void)
if (cflag) if (cflag)
{ {
des_cbc_cksum((C_Block *)buf,(C_Block *)cksum, des_cbc_cksum(buf,&cksum,
(long)len,ks,(C_Block *)cksum); (long)len,ks,&cksum);
if (!eflag) if (!eflag)
{ {
if (feof(DES_IN)) break; if (feof(DES_IN)) break;
@ -534,16 +534,16 @@ void doencryption(void)
(unsigned int)rem); (unsigned int)rem);
des_3cbc_encrypt( des_3cbc_encrypt(
(des_cblock *)buf,(des_cblock *)obuf, (des_cblock *)buf,(des_cblock *)obuf,
(long)l,ks,ks2,(des_cblock *)iv, (long)l,ks,ks2,&iv,
(des_cblock *)iv2,do_encrypt); &iv2,do_encrypt);
if (rem) memcpy(&(buf[l]),tmpbuf, if (rem) memcpy(&(buf[l]),tmpbuf,
(unsigned int)rem); (unsigned int)rem);
} }
else else
{ {
des_cbc_encrypt( des_cbc_encrypt(
(des_cblock *)buf,(des_cblock *)obuf, buf,obuf,
(long)l,ks,(des_cblock *)iv,do_encrypt); (long)l,ks,&iv,do_encrypt);
if (l >= 8) memcpy(iv,&(obuf[l-8]),8); if (l >= 8) memcpy(iv,&(obuf[l-8]),8);
} }
if (rem) memcpy(buf,&(buf[l]),(unsigned int)rem); if (rem) memcpy(buf,&(buf[l]),(unsigned int)rem);
@ -609,14 +609,14 @@ void doencryption(void)
{ {
des_3cbc_encrypt( des_3cbc_encrypt(
(des_cblock *)buf,(des_cblock *)obuf, (des_cblock *)buf,(des_cblock *)obuf,
(long)l,ks,ks2,(des_cblock *)iv, (long)l,ks,ks2,&iv,
(des_cblock *)iv2,do_encrypt); &iv2,do_encrypt);
} }
else else
{ {
des_cbc_encrypt( des_cbc_encrypt(
(des_cblock *)buf,(des_cblock *)obuf, buf,obuf,
(long)l,ks,(des_cblock *)iv,do_encrypt); (long)l,ks,&iv,do_encrypt);
if (l >= 8) memcpy(iv,&(buf[l-8]),8); if (l >= 8) memcpy(iv,&(buf[l-8]),8);
} }
@ -641,9 +641,9 @@ void doencryption(void)
l=l-8+last; l=l-8+last;
} }
i=0; i=0;
if (cflag) des_cbc_cksum((C_Block *)obuf, if (cflag) des_cbc_cksum(obuf,
(C_Block *)cksum,(long)l/8*8,ks, (des_cblock *)cksum,(long)l/8*8,ks,
(C_Block *)cksum); (des_cblock *)cksum);
while (i != l) while (i != l)
{ {
j=fwrite(obuf,1,(unsigned int)l-i,DES_OUT); j=fwrite(obuf,1,(unsigned int)l-i,DES_OUT);