diff options
Diffstat (limited to 'scheduler/auth.c')
| -rw-r--r-- | scheduler/auth.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/scheduler/auth.c b/scheduler/auth.c index 7843fe15b..83aa9c113 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 5222 2006-03-03 18:57:56Z mike $" + * "$Id: auth.c 5232 2006-03-05 17:59:19Z mike $" * * Authorization routines for the Common UNIX Printing System (CUPS). * @@ -1962,45 +1962,45 @@ cups_crypt(const char *pw, /* I - Password string */ pwlen = strlen(pw); - _cups_md5_init(&state); - _cups_md5_append(&state, (unsigned char *)pw, pwlen); - _cups_md5_append(&state, (unsigned char *)salt, salt_end - salt); + _cupsMD5Init(&state); + _cupsMD5Append(&state, (unsigned char *)pw, pwlen); + _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); - _cups_md5_init(&state2); - _cups_md5_append(&state2, (unsigned char *)pw, pwlen); - _cups_md5_append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); - _cups_md5_append(&state2, (unsigned char *)pw, pwlen); - _cups_md5_finish(&state2, digest); + _cupsMD5Init(&state2); + _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); + _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); + _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); + _cupsMD5Finish(&state2, digest); for (i = pwlen; i > 0; i -= 16) - _cups_md5_append(&state, digest, i > 16 ? 16 : i); + _cupsMD5Append(&state, digest, i > 16 ? 16 : i); for (i = pwlen; i > 0; i >>= 1) - _cups_md5_append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); + _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); - _cups_md5_finish(&state, digest); + _cupsMD5Finish(&state, digest); for (i = 0; i < 1000; i ++) { - _cups_md5_init(&state); + _cupsMD5Init(&state); if (i & 1) - _cups_md5_append(&state, (unsigned char *)pw, pwlen); + _cupsMD5Append(&state, (unsigned char *)pw, pwlen); else - _cups_md5_append(&state, digest, 16); + _cupsMD5Append(&state, digest, 16); if (i % 3) - _cups_md5_append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); + _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); if (i % 7) - _cups_md5_append(&state, (unsigned char *)pw, pwlen); + _cupsMD5Append(&state, (unsigned char *)pw, pwlen); if (i & 1) - _cups_md5_append(&state, digest, 16); + _cupsMD5Append(&state, digest, 16); else - _cups_md5_append(&state, (unsigned char *)pw, pwlen); + _cupsMD5Append(&state, (unsigned char *)pw, pwlen); - _cups_md5_finish(&state, digest); + _cupsMD5Finish(&state, digest); } /* @@ -2156,5 +2156,5 @@ to64(char *s, /* O - Output string */ /* - * End of "$Id: auth.c 5222 2006-03-03 18:57:56Z mike $". + * End of "$Id: auth.c 5232 2006-03-05 17:59:19Z mike $". */ |