diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libc/crypt/bcrypt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libc/crypt/bcrypt.c b/src/lib/libc/crypt/bcrypt.c index 0e6b00f12d..a8c1b9e7c8 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.54 2015/09/13 12:42:39 millert Exp $ */ | 1 | /* $OpenBSD: bcrypt.c,v 1.55 2015/09/13 15:33:48 guenther Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> | 4 | * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> |
| @@ -215,6 +215,7 @@ bcrypt_newhash(const char *pass, int log_rounds, char *hash, size_t hashlen) | |||
| 215 | explicit_bzero(salt, sizeof(salt)); | 215 | explicit_bzero(salt, sizeof(salt)); |
| 216 | return 0; | 216 | return 0; |
| 217 | } | 217 | } |
| 218 | DEF_WEAK(bcrypt_newhash); | ||
| 218 | 219 | ||
| 219 | int | 220 | int |
| 220 | bcrypt_checkpass(const char *pass, const char *goodhash) | 221 | bcrypt_checkpass(const char *pass, const char *goodhash) |
| @@ -232,13 +233,14 @@ bcrypt_checkpass(const char *pass, const char *goodhash) | |||
| 232 | explicit_bzero(hash, sizeof(hash)); | 233 | explicit_bzero(hash, sizeof(hash)); |
| 233 | return 0; | 234 | return 0; |
| 234 | } | 235 | } |
| 236 | DEF_WEAK(bcrypt_checkpass); | ||
| 235 | 237 | ||
| 236 | /* | 238 | /* |
| 237 | * Measure this system's performance by measuring the time for 8 rounds. | 239 | * Measure this system's performance by measuring the time for 8 rounds. |
| 238 | * We are aiming for something that takes around 0.1s, but not too much over. | 240 | * We are aiming for something that takes around 0.1s, but not too much over. |
| 239 | */ | 241 | */ |
| 240 | int | 242 | int |
| 241 | bcrypt_autorounds(void) | 243 | _bcrypt_autorounds(void) |
| 242 | { | 244 | { |
| 243 | struct timespec before, after; | 245 | struct timespec before, after; |
| 244 | int r = 8; | 246 | int r = 8; |
| @@ -391,3 +393,4 @@ bcrypt(const char *pass, const char *salt) | |||
| 391 | 393 | ||
| 392 | return gencrypted; | 394 | return gencrypted; |
| 393 | } | 395 | } |
| 396 | DEF_WEAK(bcrypt); | ||
