diff options
| author |   deraadt <deraadt@openbsd.org> | 2006-04-02 04:13:07 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2006-04-02 04:13:07 +0000 |
| commit | 775bf13069400c1549687e34b364fd0cc899557d (patch) | |
| tree | a9858a9a30f81f47962a9d241cd726d6f6898ad9 | |
| parent | Enable DEBUG=-g -ggdb for rcs, move -g -ggdb out of CFLAGS for cvs. (diff) | |
| download | wireguard-openbsd-775bf13069400c1549687e34b364fd0cc899557d.tar.xz wireguard-openbsd-775bf13069400c1549687e34b364fd0cc899557d.zip | |
oops, to64() is shared.
| -rw-r--r-- | usr.bin/encrypt/encrypt.c | 4 | ||||
| -rw-r--r-- | usr.bin/passwd/pwd_gensalt.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/encrypt/encrypt.c b/usr.bin/encrypt/encrypt.c index 4ef6ca4a9f6..f54e3ccaeab 100644 --- a/usr.bin/encrypt/encrypt.c +++ b/usr.bin/encrypt/encrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: encrypt.c,v 1.21 2004/07/13 21:09:48 millert Exp $ */ +/* $OpenBSD: encrypt.c,v 1.22 2006/04/02 04:13:07 deraadt Exp $ */ /* * Copyright (c) 1996, Jason Downs. All rights reserved. @@ -86,7 +86,7 @@ print_passwd(char *string, int operation, void *extra) char msalt[3], *salt; login_cap_t *lc; int pwd_gensalt(char *, int, login_cap_t *, char); - void to64(char *, int32_t, int n); + void to64(char *, u_int32_t, int n); switch(operation) { case DO_MAKEKEY: diff --git a/usr.bin/passwd/pwd_gensalt.c b/usr.bin/passwd/pwd_gensalt.c index 38777334047..3e4800792fe 100644 --- a/usr.bin/passwd/pwd_gensalt.c +++ b/usr.bin/passwd/pwd_gensalt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd_gensalt.c,v 1.24 2006/04/02 01:00:18 deraadt Exp $ */ +/* $OpenBSD: pwd_gensalt.c,v 1.25 2006/04/02 04:13:08 deraadt Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -41,9 +41,9 @@ #include <time.h> #include <login_cap.h> -static void to64(char *, u_int32_t, int n); -char *bcrypt_gensalt(u_int8_t); -int pwd_gensalt(char *, int, login_cap_t *, char); +void to64(char *, u_int32_t, int n); +char *bcrypt_gensalt(u_int8_t); +int pwd_gensalt(char *, int, login_cap_t *, char); #define YPCIPHER_DEF "old" #define LOCALCIPHER_DEF "blowfish,6" @@ -132,7 +132,7 @@ pwd_gensalt(char *salt, int saltlen, login_cap_t *lc, char type) static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -static void +void to64(char *s, u_int32_t v, int n) { while (--n >= 0) { |