summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-05-30 16:58:22 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-05-30 16:58:22 +1000
commit3cb84e5ec8a8d4297981aca60ac4fced346eea41 (patch)
tree4e20be989085f771924a18a09cc73818beabe988
parenta6a7c19dcbd96553b63b7524490e3528bd726ed8 (diff)
- (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
roumenpetrov.info
-rw-r--r--ChangeLog6
-rw-r--r--md5crypt.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b8381e91..826860701 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120030530
2 - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
3 roumenpetrov.info
4
120030526 520030526
2 - (djm) Avoid auth2-chall.c warning when compiling without 6 - (djm) Avoid auth2-chall.c warning when compiling without
3 PAM, BSD_AUTH and SKEY 7 PAM, BSD_AUTH and SKEY
@@ -1618,4 +1622,4 @@
1618 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1622 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1619 ok provos@ 1623 ok provos@
1620 1624
1621$Id: ChangeLog,v 1.2752 2003/05/26 11:36:13 djm Exp $ 1625$Id: ChangeLog,v 1.2753 2003/05/30 06:58:22 dtucker Exp $
diff --git a/md5crypt.c b/md5crypt.c
index e483ade8c..e14d53ac1 100644
--- a/md5crypt.c
+++ b/md5crypt.c
@@ -13,7 +13,7 @@
13#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) 13#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
14#include <openssl/md5.h> 14#include <openssl/md5.h>
15 15
16RCSID("$Id: md5crypt.c,v 1.6 2003/05/18 14:46:46 djm Exp $"); 16RCSID("$Id: md5crypt.c,v 1.7 2003/05/30 06:58:23 dtucker Exp $");
17 17
18/* 0 ... 63 => ascii - 64 */ 18/* 0 ... 63 => ascii - 64 */
19static unsigned char itoa64[] = 19static unsigned char itoa64[] =
@@ -157,7 +157,7 @@ md5_crypt(const char *pw, const char *salt)
157 memset(salt_copy, 0, sizeof(salt_copy)); 157 memset(salt_copy, 0, sizeof(salt_copy));
158 memset(&ctx, 0, sizeof(ctx)); 158 memset(&ctx, 0, sizeof(ctx));
159 memset(&ctx1, 0, sizeof(ctx1)); 159 memset(&ctx1, 0, sizeof(ctx1));
160 (void)to64(0, 4) 160 (void)to64(0, 4);
161 161
162 return (passwd); 162 return (passwd);
163} 163}