summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-05-05 19:09:46 +1000
committerDamien Miller <djm@mindrot.org>2015-05-10 11:57:23 +1000
commit8ac6b13cc9113eb47cd9e86c97d7b26b4b71b77f (patch)
tree8b5f9453e0a48e4a2049dd1fc5c86db753a9d4b9
parent1f792489d5cf86a4f4e3003e6e9177654033f0f2 (diff)
upstream commit
- djm@cvs.openbsd.org 2014/12/30 01:41:43 [bcrypt_pbkdf.c] typo in comment: ouput => output
-rw-r--r--openbsd-compat/bcrypt_pbkdf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/openbsd-compat/bcrypt_pbkdf.c b/openbsd-compat/bcrypt_pbkdf.c
index 16912575a..f412829b6 100644
--- a/openbsd-compat/bcrypt_pbkdf.c
+++ b/openbsd-compat/bcrypt_pbkdf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bcrypt_pbkdf.c,v 1.9 2014/07/13 21:21:25 tedu Exp $ */ 1/* $OpenBSD: bcrypt_pbkdf.c,v 1.10 2014/12/30 01:41:43 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> 3 * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
4 * 4 *
@@ -156,7 +156,7 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const u_int8_t *salt, size_t salt
156 } 156 }
157 157
158 /* 158 /*
159 * pbkdf2 deviation: ouput the key material non-linearly. 159 * pbkdf2 deviation: output the key material non-linearly.
160 */ 160 */
161 amt = MIN(amt, keylen); 161 amt = MIN(amt, keylen);
162 for (i = 0; i < amt; i++) { 162 for (i = 0; i < amt; i++) {