oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

BSIZE -> des_BSIZE to avoid conflicts with AIX jfs/fsparam.h

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8884 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-08-03 12:18:49 +00:00
parent 3ed2beb9a1
commit d7dfbdd7ab
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/des/des_locl.h
View File

@@ -223,7 +223,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
/* used in des_read and des_write */
#define MAXWRITE (1024*16)
#define BSIZE (MAXWRITE+4)
#define des_BSIZE (MAXWRITE+4)
#define c2l(c,l) (l =((DES_LONG)(*((c)++))) , \
l|=((DES_LONG)(*((c)++)))<< 8L, \

6
lib/des/enc_read.c
View File

@@ -87,17 +87,17 @@ des_cblock (*iv);
if (tmpbuf == NULL)
{
tmpbuf=(char *)malloc(BSIZE);
tmpbuf=(char *)malloc(des_BSIZE);
if (tmpbuf == NULL) return(-1);
}
if (net == NULL)
{
net=(unsigned char *)malloc(BSIZE);
net=(unsigned char *)malloc(des_BSIZE);
if (net == NULL) return(-1);
}
if (unnet == NULL)
{
unnet=(char *)malloc(BSIZE);
unnet=(char *)malloc(des_BSIZE);
if (unnet == NULL) return(-1);
}
/* left over data from last decrypt */

2
lib/des/enc_writ.c
View File

@@ -83,7 +83,7 @@ des_cblock (*iv);
if (outbuf == NULL)
{
outbuf=(char *)malloc(BSIZE+HDRSIZE);
outbuf=(char *)malloc(des_BSIZE+HDRSIZE);
if (outbuf == NULL) return(-1);
}
/* If we are sending less than 8 bytes, the same char will look