projects
/
srvx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ
[srvx.git]
/
src
/
md5.c
diff --git
a/src/md5.c
b/src/md5.c
index 189d45d85968553d69cf285cab96b79a4fe7178c..fe5495fe8a580360aee4926a650c69ad0d086654 100644
(file)
--- a/
src/md5.c
+++ b/
src/md5.c
@@
-111,10
+111,10
@@
MD5_CTX *context; /* context */
unsigned char *input; /* input block */
unsigned int inputLen; /* length of input block */
{
unsigned char *input; /* input block */
unsigned int inputLen; /* length of input block */
{
- unsigned int i, i
nde
x, partLen;
+ unsigned int i, i
d
x, partLen;
/* Compute number of bytes mod 64 */
/* Compute number of bytes mod 64 */
- i
nde
x = (unsigned int)((context->count[0] >> 3) & 0x3F);
+ i
d
x = (unsigned int)((context->count[0] >> 3) & 0x3F);
/* Update number of bits */
if ((context->count[0] += ((UINT4)inputLen << 3))
/* Update number of bits */
if ((context->count[0] += ((UINT4)inputLen << 3))
@@
-122,23
+122,23
@@
unsigned int inputLen; /* length of input block */
context->count[1]++;
context->count[1] += ((UINT4)inputLen >> 29);
context->count[1]++;
context->count[1] += ((UINT4)inputLen >> 29);
- partLen = 64 - i
nde
x;
+ partLen = 64 - i
d
x;
/* Transform as many times as possible. */
if (inputLen >= partLen) {
/* Transform as many times as possible. */
if (inputLen >= partLen) {
- memcpy((POINTER)&context->buffer[i
nde
x], (POINTER)input, partLen);
+ memcpy((POINTER)&context->buffer[i
d
x], (POINTER)input, partLen);
MD5Transform (context->state, context->buffer);
for (i = partLen; i + 63 < inputLen; i += 64)
MD5Transform (context->state, context->buffer);
for (i = partLen; i + 63 < inputLen; i += 64)
- MD5Transform (context->state, &input[i]);
+
MD5Transform (context->state, &input[i]);
- i
nde
x = 0;
+ i
d
x = 0;
}
else
i = 0;
/* Buffer remaining input */
}
else
i = 0;
/* Buffer remaining input */
- memcpy((POINTER)&context->buffer[i
nde
x], (POINTER)&input[i],
+ memcpy((POINTER)&context->buffer[i
d
x], (POINTER)&input[i],
inputLen-i);
}
inputLen-i);
}
@@
-150,14
+150,14
@@
unsigned char digest[16]; /* message digest */
MD5_CTX *context; /* context */
{
unsigned char bits[8];
MD5_CTX *context; /* context */
{
unsigned char bits[8];
- unsigned int i
nde
x, padLen;
+ unsigned int i
d
x, padLen;
/* Save number of bits */
Encode (bits, context->count, 8);
/* Pad out to 56 mod 64. */
/* Save number of bits */
Encode (bits, context->count, 8);
/* Pad out to 56 mod 64. */
- i
nde
x = (unsigned int)((context->count[0] >> 3) & 0x3f);
- padLen = (i
ndex < 56) ? (56 - index) : (120 - inde
x);
+ i
d
x = (unsigned int)((context->count[0] >> 3) & 0x3f);
+ padLen = (i
dx < 56) ? (56 - idx) : (120 - id
x);
MD5Update (context, PADDING, padLen);
/* Append length (before padding) */
MD5Update (context, PADDING, padLen);
/* Append length (before padding) */
@@
-338,8
+338,8
@@
cryptpass_real(const char *pass, char *buffer, int seed)
j = 0;
}
for (i=0; i<sizeof(buff); i++) {
j = 0;
}
for (i=0; i<sizeof(buff); i++) {
- buffer[j++] = hex_digits[buff[i] >> 4];
- buffer[j++] = hex_digits[buff[i] & 15];
+
buffer[j++] = hex_digits[buff[i] >> 4];
+
buffer[j++] = hex_digits[buff[i] & 15];
}
buffer[j] = 0;
return buffer;
}
buffer[j] = 0;
return buffer;
@@
-354,20
+354,20
@@
cryptpass(const char *pass, char *buffer)
}
int
}
int
-checkpass(const char *pass, const char *crypt)
+checkpass(const char *pass, const char *crypt
ed
)
{
{
- char new_crypt[MD5_CRYPT_LENGTH], hseed[9];
+ char new_crypt
ed
[MD5_CRYPT_LENGTH], hseed[9];
int seed;
int seed;
- if (crypt[0] == '$') {
+ if (crypt
ed
[0] == '$') {
/* new-style crypt, use "seed" after '$' */
/* new-style crypt, use "seed" after '$' */
- strncpy(hseed, crypt+1, 8);
+ strncpy(hseed, crypt
ed
+1, 8);
hseed[8] = 0;
seed = strtoul(hseed, NULL, 16);
} else {
/* old-style crypt, use "seed" of 0 */
seed = 0;
}
hseed[8] = 0;
seed = strtoul(hseed, NULL, 16);
} else {
/* old-style crypt, use "seed" of 0 */
seed = 0;
}
- cryptpass_real(pass, new_crypt, seed);
- return !strcmp(crypt
, new_crypt
);
+ cryptpass_real(pass, new_crypt
ed
, seed);
+ return !strcmp(crypt
ed, new_crypted
);
}
}