summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2012-09-04 22:16:18 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2012-09-04 22:16:18 +0000
commit43a669e8d0b317e751fe50156052adfef09c3b97 (patch)
treed3519330c88cb16a06d594e5bb5283ccfbb5d3f5 /lib/libc
parent735d844387993e452b35ad23dab5ddcfea2d8416 (diff)
arc4random_buf is the easy way to fill a buffer now. ok deraadt
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/crypt/bcrypt.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c
index 207e76ea469..e76f277718f 100644
--- a/lib/libc/crypt/bcrypt.c
+++ b/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcrypt.c,v 1.24 2008/04/02 19:54:05 millert Exp $ */
+/* $OpenBSD: bcrypt.c,v 1.25 2012/09/04 22:16:17 tedu Exp $ */
/*
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -148,15 +148,8 @@ char *
bcrypt_gensalt(u_int8_t log_rounds)
{
u_int8_t csalt[BCRYPT_MAXSALT];
- u_int16_t i;
- u_int32_t seed = 0;
-
- for (i = 0; i < BCRYPT_MAXSALT; i++) {
- if (i % 4 == 0)
- seed = arc4random();
- csalt[i] = seed & 0xff;
- seed = seed >> 8;
- }
+
+ arc4random_buf(csalt, sizeof(csalt));
if (log_rounds < 4)
log_rounds = 4;