summaryrefslogtreecommitdiff
path: root/lib/libc/crypt
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-03-24 00:00:30 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-03-24 00:00:30 +0000
commitf75538b630ba05fcf2635e8fe5e4f51c32f429ea (patch)
treecaca986387a3565e326220da5cab010a3b48b867 /lib/libc/crypt
parent3adaaa55df44047597208abe47256a1c983c0262 (diff)
oops, merge error
Diffstat (limited to 'lib/libc/crypt')
-rw-r--r--lib/libc/crypt/bcrypt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c
index 4fa36bf6e25..7760ac7c0cb 100644
--- a/lib/libc/crypt/bcrypt.c
+++ b/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcrypt.c,v 1.35 2014/03/23 23:27:52 tedu Exp $ */
+/* $OpenBSD: bcrypt.c,v 1.36 2014/03/24 00:00:29 tedu Exp $ */
/*
* Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
@@ -73,7 +73,7 @@ bcrypt_initsalt(int log_rounds, uint8_t *salt, size_t saltbuflen)
else if (log_rounds > 31)
log_rounds = 31;
- snprintf(salt, 4, "$2a$%2.2u$", log_rounds);
+ snprintf(salt, saltbuflen, "$2a$%2.2u$", log_rounds);
encode_base64((uint8_t *)salt + 7, csalt, sizeof(csalt));
return 0;