chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
site: Send NAKs for undecryptable data packets (msg0)
[secnet.git]
/
md5.c
diff --git
a/md5.c
b/md5.c
index 8c962d9a4bac76ee2bf09f9230964c5c14b6f8f0..343ad8fc893cdd29bbc208c74b7e044f7499d857 100644
(file)
--- a/
md5.c
+++ b/
md5.c
@@
-26,7
+26,7
@@
#ifdef WORDS_BIGENDIAN
static void
#ifdef WORDS_BIGENDIAN
static void
-byteSwap(uint32_t *buf,
unsigned
words)
+byteSwap(uint32_t *buf,
int
words)
{
md5byte *p = (md5byte *)buf;
{
md5byte *p = (md5byte *)buf;
@@
-129,7
+129,7
@@
MD5Final(md5byte digest[16], struct MD5Context *ctx)
byteSwap(ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
byteSwap(ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof
(ctx)
); /* In case it's sensitive */
+ memset(ctx, 0, sizeof
*ctx
); /* In case it's sensitive */
}
#ifndef ASM_MD5
}
#ifndef ASM_MD5
@@
-247,7
+247,7
@@
static void *md5_init(void)
return ctx;
}
return ctx;
}
-static void md5_update(void *sst,
uint8_t const *buf, u
int32_t len)
+static void md5_update(void *sst,
const void *buf,
int32_t len)
{
struct MD5Context *ctx=sst;
{
struct MD5Context *ctx=sst;
@@
-267,12
+267,11
@@
struct md5 {
struct hash_if ops;
};
struct hash_if ops;
};
-init_module md5_module;
void md5_module(dict_t *dict)
{
struct md5 *st;
void *ctx;
void md5_module(dict_t *dict)
{
struct md5 *st;
void *ctx;
- string_t testinput="12345\n";
+
c
string_t testinput="12345\n";
uint8_t expected[16]=
{0xd5,0x77,0x27,0x3f,0xf8,0x85,0xc3,0xf8,
0x4d,0xad,0xb8,0x57,0x8b,0xb4,0x13,0x99};
uint8_t expected[16]=
{0xd5,0x77,0x27,0x3f,0xf8,0x85,0xc3,0xf8,
0x4d,0xad,0xb8,0x57,0x8b,0xb4,0x13,0x99};
@@
-296,7
+295,7
@@
void md5_module(dict_t *dict)
md5_final(ctx,digest);
for (i=0; i<16; i++) {
if (digest[i]!=expected[i]) {
md5_final(ctx,digest);
for (i=0; i<16; i++) {
if (digest[i]!=expected[i]) {
- fatal("md5 module failed self-test
\n
");
+ fatal("md5 module failed self-test");
}
}
}
}
}
}