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:
@@ -69,7 +69,7 @@ md4_init (struct md4 *m)
|
||||
}
|
||||
|
||||
static u_int32_t
|
||||
cshift (u_int32_t x, unsigned n)
|
||||
cshift (u_int32_t x, unsigned int n)
|
||||
{
|
||||
return (x << n) | (x >> (32 - n));
|
||||
}
|
||||
@@ -228,7 +228,7 @@ md4_finito (struct md4 *m, void *res)
|
||||
{
|
||||
static u_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);
|
||||
|
Reference in New Issue
Block a user