nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Oops - now let's get that MD5 change _right_ :-)

Browse Source 
[originally from svn r438]
This commit is contained in:
Simon Tatham 2000-04-04 14:51:17 +00:00
parent 50b0f49eaf
commit 300b778092
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssh.h
View File

@ -37,7 +37,7 @@ struct MD5Context {
unsigned long hHash; unsigned long hHash;
#else #else
MD5_Core_State core; MD5_Core_State core;
unsigned char block[BLKSIZE]; unsigned char block[64];
int blkused; int blkused;
uint32 lenhi, lenlo; uint32 lenhi, lenlo;
#endif #endif

10
sshmd5.c
View File

@ -19,10 +19,6 @@
#define subround(f,w,x,y,z,k,s,ti) \ #define subround(f,w,x,y,z,k,s,ti) \
w = x + rol(w + f(x,y,z) + block[k] + ti, s) 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) { void MD5_Core_Init(MD5_Core_State *s) {
s->h[0] = 0x67452301; s->h[0] = 0x67452301;
s->h[1] = 0xefcdab89; 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) { void MD5Final(unsigned char output[16], struct MD5Context *s) {
int i; int i;
int pad; unsigned pad;
unsigned char c[64]; unsigned char c[64];
uint32 lenhi, lenlo; uint32 lenhi, lenlo;
@ -176,7 +172,7 @@ void MD5Final(unsigned char output[16], struct MD5Context *s) {
memset(c, 0, pad); memset(c, 0, pad);
c[0] = 0x80; c[0] = 0x80;
MD5_Bytes(s, &c, pad); MD5Update(s, c, pad);
c[7] = (lenhi >> 24) & 0xFF; c[7] = (lenhi >> 24) & 0xFF;
c[6] = (lenhi >> 16) & 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[1] = (lenlo >> 8) & 0xFF;
c[0] = (lenlo >> 0) & 0xFF; c[0] = (lenlo >> 0) & 0xFF;
MD5_Bytes(s, &c, 8); MD5Update(s, c, 8);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
output[4*i+3] = (s->core.h[i] >> 24) & 0xFF; output[4*i+3] = (s->core.h[i] >> 24) & 0xFF;