projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops - puttytel now needs a stub random_destroy_seed() to compile
[u/mdw/putty]
/
sshmd5.c
diff --git
a/sshmd5.c
b/sshmd5.c
index
43c274c
..
f2ce2b3
100644
(file)
--- a/
sshmd5.c
+++ b/
sshmd5.c
@@
-19,10
+19,6
@@
#define subround(f,w,x,y,z,k,s,ti) \
w = x + rol(w + f(x,y,z) + block[k] + ti, s)
#define subround(f,w,x,y,z,k,s,ti) \
w = x + rol(w + f(x,y,z) + block[k] + ti, s)
-typedef struct {
- uint32 h[4];
-} MD5_Core_State;
-
void MD5_Core_Init(MD5_Core_State *s) {
s->h[0] = 0x67452301;
s->h[1] = 0xefcdab89;
void MD5_Core_Init(MD5_Core_State *s) {
s->h[0] = 0x67452301;
s->h[1] = 0xefcdab89;
@@
-162,7
+158,7
@@
void MD5Update(struct MD5Context *s, unsigned char const *p,
void MD5Final(unsigned char output[16], struct MD5Context *s) {
int i;
void MD5Final(unsigned char output[16], struct MD5Context *s) {
int i;
-
int
pad;
+
unsigned
pad;
unsigned char c[64];
uint32 lenhi, lenlo;
unsigned char c[64];
uint32 lenhi, lenlo;
@@
-176,7
+172,7
@@
void MD5Final(unsigned char output[16], struct MD5Context *s) {
memset(c, 0, pad);
c[0] = 0x80;
memset(c, 0, pad);
c[0] = 0x80;
- MD5
_Bytes(s, &
c, pad);
+ MD5
Update(s,
c, pad);
c[7] = (lenhi >> 24) & 0xFF;
c[6] = (lenhi >> 16) & 0xFF;
c[7] = (lenhi >> 24) & 0xFF;
c[6] = (lenhi >> 16) & 0xFF;
@@
-187,7
+183,7
@@
void MD5Final(unsigned char output[16], struct MD5Context *s) {
c[1] = (lenlo >> 8) & 0xFF;
c[0] = (lenlo >> 0) & 0xFF;
c[1] = (lenlo >> 8) & 0xFF;
c[0] = (lenlo >> 0) & 0xFF;
- MD5
_Bytes(s, &
c, 8);
+ MD5
Update(s,
c, 8);
for (i = 0; i < 4; i++) {
output[4*i+3] = (s->core.h[i] >> 24) & 0xFF;
for (i = 0; i < 4; i++) {
output[4*i+3] = (s->core.h[i] >> 24) & 0xFF;