Fixes for code merge

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3604 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-10-14 15:16:33 +00:00
parent 42e9239404
commit 1d3d4ada88
6 changed files with 25 additions and 13 deletions

View File

@@ -71,7 +71,7 @@ sha_init (struct sha *m)
}
static inline u_int32_t
cshift (u_int32_t x, unsigned n)
cshift (u_int32_t x, unsigned int n)
{
return (x << n) | (x >> (32 - n));
}
@@ -276,7 +276,7 @@ sha_finito (struct sha *m, void *res)
{
static unsigned char zeros[72];
u_int32_t len;
unsigned dstart = (120 - m->offset - 1) % 64 + 1;
unsigned int dstart = (120 - m->offset - 1) % 64 + 1;
*zeros = 0x80;
memset (zeros + 1, 0, sizeof(zeros) - 1);