diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-02-16 21:28:12 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-02-16 21:28:12 +0000 |
| commit | 6d57a1a176004a7d8fc009cdcf760098f86e3263 (patch) | |
| tree | ee423c619fad03813234b9362694a17f3a638f0b /lib/libc/crypt | |
| parent | c707cb295fc3cac8d8feb343e949e0dcf71b8476 (diff) | |
Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.
Diffstat (limited to 'lib/libc/crypt')
| -rw-r--r-- | lib/libc/crypt/bcrypt.c | 10 | ||||
| -rw-r--r-- | lib/libc/crypt/crypt.c | 8 | ||||
| -rw-r--r-- | lib/libc/crypt/md5crypt.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c index be049baa74c..f3ea849f006 100644 --- a/lib/libc/crypt/bcrypt.c +++ b/lib/libc/crypt/bcrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcrypt.c,v 1.14 2001/01/04 21:45:30 todd Exp $ */ +/* $OpenBSD: bcrypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -66,11 +66,11 @@ #define BCRYPT_BLOCKS 6 /* Ciphertext blocks */ #define BCRYPT_MINROUNDS 16 /* we have log2(rounds) in salt */ -char *bcrypt_gensalt __P((u_int8_t)); +char *bcrypt_gensalt(u_int8_t); -static void encode_salt __P((char *, u_int8_t *, u_int16_t, u_int8_t)); -static void encode_base64 __P((u_int8_t *, u_int8_t *, u_int16_t)); -static void decode_base64 __P((u_int8_t *, u_int16_t, u_int8_t *)); +static void encode_salt(char *, u_int8_t *, u_int16_t, u_int8_t); +static void encode_base64(u_int8_t *, u_int8_t *, u_int16_t); +static void decode_base64(u_int8_t *, u_int16_t, u_int8_t *); static char encrypted[_PASSWORD_LEN]; static char gsalt[BCRYPT_MAXSALT * 4 / 3 + 1]; diff --git a/lib/libc/crypt/crypt.c b/lib/libc/crypt/crypt.c index d1a342c1787..6a0b6243fe6 100644 --- a/lib/libc/crypt/crypt.c +++ b/lib/libc/crypt/crypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $ */ +/* $OpenBSD: crypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $ */ /* * FreeSec: libcrypt @@ -52,7 +52,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $"; +static char rcsid[] = "$OpenBSD: crypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -594,8 +594,8 @@ crypt(key, setting) u_int32_t count, salt, l, r0, r1, keybuf[2]; u_char *p, *q; static u_char output[21]; - extern char *md5crypt __P((const char *, const char *)); - extern char *bcrypt __P((const char *, const char *)); + extern char *md5crypt(const char *, const char *); + extern char *bcrypt(const char *, const char *); if (setting[0] == '$') { switch (setting[1]) { diff --git a/lib/libc/crypt/md5crypt.c b/lib/libc/crypt/md5crypt.c index 7ec60f38e0c..56ab66fbb59 100644 --- a/lib/libc/crypt/md5crypt.c +++ b/lib/libc/crypt/md5crypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $ */ +/* $OpenBSD: md5crypt.c,v 1.10 2002/02/16 21:27:22 millert Exp $ */ /* * ---------------------------------------------------------------------------- @@ -13,7 +13,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.10 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <unistd.h> @@ -25,7 +25,7 @@ static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey E static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -static void to64 __P((char *, u_int32_t, int)); +static void to64(char *, u_int32_t, int); static void to64(s, v, n) |