diff options
Diffstat (limited to 'src/lib/libc/crypt')
-rw-r--r-- | src/lib/libc/crypt/bcrypt.c | 10 | ||||
-rw-r--r-- | src/lib/libc/crypt/crypt.c | 8 | ||||
-rw-r--r-- | src/lib/libc/crypt/md5crypt.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libc/crypt/bcrypt.c b/src/lib/libc/crypt/bcrypt.c index be049baa74..f3ea849f00 100644 --- a/src/lib/libc/crypt/bcrypt.c +++ b/src/lib/libc/crypt/bcrypt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bcrypt.c,v 1.14 2001/01/04 21:45:30 todd Exp $ */ | 1 | /* $OpenBSD: bcrypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> | 4 | * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> |
@@ -66,11 +66,11 @@ | |||
66 | #define BCRYPT_BLOCKS 6 /* Ciphertext blocks */ | 66 | #define BCRYPT_BLOCKS 6 /* Ciphertext blocks */ |
67 | #define BCRYPT_MINROUNDS 16 /* we have log2(rounds) in salt */ | 67 | #define BCRYPT_MINROUNDS 16 /* we have log2(rounds) in salt */ |
68 | 68 | ||
69 | char *bcrypt_gensalt __P((u_int8_t)); | 69 | char *bcrypt_gensalt(u_int8_t); |
70 | 70 | ||
71 | static void encode_salt __P((char *, u_int8_t *, u_int16_t, u_int8_t)); | 71 | static void encode_salt(char *, u_int8_t *, u_int16_t, u_int8_t); |
72 | static void encode_base64 __P((u_int8_t *, u_int8_t *, u_int16_t)); | 72 | static void encode_base64(u_int8_t *, u_int8_t *, u_int16_t); |
73 | static void decode_base64 __P((u_int8_t *, u_int16_t, u_int8_t *)); | 73 | static void decode_base64(u_int8_t *, u_int16_t, u_int8_t *); |
74 | 74 | ||
75 | static char encrypted[_PASSWORD_LEN]; | 75 | static char encrypted[_PASSWORD_LEN]; |
76 | static char gsalt[BCRYPT_MAXSALT * 4 / 3 + 1]; | 76 | static char gsalt[BCRYPT_MAXSALT * 4 / 3 + 1]; |
diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c index d1a342c178..6a0b6243fe 100644 --- a/src/lib/libc/crypt/crypt.c +++ b/src/lib/libc/crypt/crypt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $ */ | 1 | /* $OpenBSD: crypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * FreeSec: libcrypt | 4 | * FreeSec: libcrypt |
@@ -52,7 +52,7 @@ | |||
52 | */ | 52 | */ |
53 | 53 | ||
54 | #if defined(LIBC_SCCS) && !defined(lint) | 54 | #if defined(LIBC_SCCS) && !defined(lint) |
55 | static char rcsid[] = "$OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $"; | 55 | static char rcsid[] = "$OpenBSD: crypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $"; |
56 | #endif /* LIBC_SCCS and not lint */ | 56 | #endif /* LIBC_SCCS and not lint */ |
57 | 57 | ||
58 | #include <sys/types.h> | 58 | #include <sys/types.h> |
@@ -594,8 +594,8 @@ crypt(key, setting) | |||
594 | u_int32_t count, salt, l, r0, r1, keybuf[2]; | 594 | u_int32_t count, salt, l, r0, r1, keybuf[2]; |
595 | u_char *p, *q; | 595 | u_char *p, *q; |
596 | static u_char output[21]; | 596 | static u_char output[21]; |
597 | extern char *md5crypt __P((const char *, const char *)); | 597 | extern char *md5crypt(const char *, const char *); |
598 | extern char *bcrypt __P((const char *, const char *)); | 598 | extern char *bcrypt(const char *, const char *); |
599 | 599 | ||
600 | if (setting[0] == '$') { | 600 | if (setting[0] == '$') { |
601 | switch (setting[1]) { | 601 | switch (setting[1]) { |
diff --git a/src/lib/libc/crypt/md5crypt.c b/src/lib/libc/crypt/md5crypt.c index 7ec60f38e0..56ab66fbb5 100644 --- a/src/lib/libc/crypt/md5crypt.c +++ b/src/lib/libc/crypt/md5crypt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $ */ | 1 | /* $OpenBSD: md5crypt.c,v 1.10 2002/02/16 21:27:22 millert Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * ---------------------------------------------------------------------------- | 4 | * ---------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #if defined(LIBC_SCCS) && !defined(lint) | 15 | #if defined(LIBC_SCCS) && !defined(lint) |
16 | static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $"; | 16 | static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.10 2002/02/16 21:27:22 millert Exp $"; |
17 | #endif /* LIBC_SCCS and not lint */ | 17 | #endif /* LIBC_SCCS and not lint */ |
18 | 18 | ||
19 | #include <unistd.h> | 19 | #include <unistd.h> |
@@ -25,7 +25,7 @@ static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey E | |||
25 | static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ | 25 | static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ |
26 | "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; | 26 | "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; |
27 | 27 | ||
28 | static void to64 __P((char *, u_int32_t, int)); | 28 | static void to64(char *, u_int32_t, int); |
29 | 29 | ||
30 | static void | 30 | static void |
31 | to64(s, v, n) | 31 | to64(s, v, n) |