summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2013-06-04 15:54:33 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2013-06-04 15:54:33 +0000
commitdac12a7a17482a4b9a2bcaa2b925528d420a9f5f (patch)
treefabe39b7e3a9a8feaa0ab64cc65a8df3538a654b
parent6faf2671ee8ba884b9ceb36c3310bed8f38d80e2 (diff)
oops, rounds is unsigned now
-rw-r--r--lib/libutil/bcrypt_pbkdf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libutil/bcrypt_pbkdf.c b/lib/libutil/bcrypt_pbkdf.c
index 732499be0c9..24b628cc3f4 100644
--- a/lib/libutil/bcrypt_pbkdf.c
+++ b/lib/libutil/bcrypt_pbkdf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcrypt_pbkdf.c,v 1.1 2013/06/03 21:07:02 tedu Exp $ */
+/* $OpenBSD: bcrypt_pbkdf.c,v 1.2 2013/06/04 15:54:32 tedu Exp $ */
/*
* Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
*
@@ -107,8 +107,6 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltl
uint32_t count;
/* nothing crazy */
- if (rounds < 1)
- return -1;
if (passlen == 0 || saltlen == 0 || keylen == 0 ||
keylen > sizeof(out) * sizeof(out))
return -1;