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

Fixes for code merge

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/des/md4.c
View File

@@ -69,7 +69,7 @@ md4_init (struct md4 *m)
} }
static u_int32_t 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)); return (x << n) | (x >> (32 - n));
} }
@@ -228,7 +228,7 @@ md4_finito (struct md4 *m, void *res)
{ {
static u_char zeros[72]; static u_char zeros[72];
u_int32_t len; u_int32_t len;
unsigned dstart = (120 - m->offset - 1) % 64 + 1; unsigned int dstart = (120 - m->offset - 1) % 64 + 1;
*zeros = 0x80; *zeros = 0x80;
memset (zeros + 1, 0, sizeof(zeros) - 1); memset (zeros + 1, 0, sizeof(zeros) - 1);

8
lib/des/md4.h
View File

@@ -45,11 +45,15 @@
#ifdef HAVE_SYS_BITYPES_H #ifdef HAVE_SYS_BITYPES_H
#include <sys/bitypes.h> #include <sys/bitypes.h>
#endif #endif
#ifdef KRB5
#include <krb5-types.h> #include <krb5-types.h>
#elif defined(KRB4)
#include <ktypes.h>
#endif
struct md4 { struct md4 {
unsigned offset; unsigned int offset;
unsigned sz; unsigned int sz;
u_int32_t counter[4]; u_int32_t counter[4];
unsigned char save[64]; unsigned char save[64];
}; };

6
lib/des/md5.c
View File

@@ -69,7 +69,7 @@ md5_init (struct md5 *m)
} }
static inline u_int32_t 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)); return (x << n) | (x >> (32 - n));
} }
@@ -250,9 +250,9 @@ md5_update (struct md5 *m, const void *v, size_t len)
void void
md5_finito (struct md5 *m, void *res) md5_finito (struct md5 *m, void *res)
{ {
static u_char zeros[72]; static unsigned char zeros[72];
u_int32_t len; u_int32_t len;
unsigned dstart = (120 - m->offset - 1) % 64 + 1; unsigned int dstart = (120 - m->offset - 1) % 64 + 1;
*zeros = 0x80; *zeros = 0x80;
memset (zeros + 1, 0, sizeof(zeros) - 1); memset (zeros + 1, 0, sizeof(zeros) - 1);

8
lib/des/md5.h
View File

@@ -45,11 +45,15 @@
#ifdef HAVE_SYS_BITYPES_H #ifdef HAVE_SYS_BITYPES_H
#include <sys/bitypes.h> #include <sys/bitypes.h>
#endif #endif
#ifdef KRB5
#include <krb5-types.h> #include <krb5-types.h>
#elif defined(KRB4)
#include <ktypes.h>
#endif
struct md5 { struct md5 {
unsigned offset; unsigned int offset;
unsigned sz; unsigned int sz;
u_int32_t counter[4]; u_int32_t counter[4];
unsigned char save[64]; unsigned char save[64];
}; };

4
lib/des/sha.c
View File

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

8
lib/des/sha.h
View File

@@ -45,11 +45,15 @@
#ifdef HAVE_SYS_BITYPES_H #ifdef HAVE_SYS_BITYPES_H
#include <sys/bitypes.h> #include <sys/bitypes.h>
#endif #endif
#ifdef KRB5
#include <krb5-types.h> #include <krb5-types.h>
#elif defined(KRB4)
#include <ktypes.h>
#endif
struct sha { struct sha {
unsigned offset; unsigned int offset;
unsigned sz; unsigned int sz;
u_int32_t counter[5]; u_int32_t counter[5];
unsigned char save[64]; unsigned char save[64];
}; };