summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/authfile.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2014-03-12 04:51:13 +0000
committerDamien Miller <djm@cvs.openbsd.org>2014-03-12 04:51:13 +0000
commit41d237d5bb2549e92fc4a43416c81ceabe56d4dc (patch)
tree0e65f6163eb6d6edcf489eef65bb1125cdf50545 /usr.bin/ssh/authfile.c
parentccbf30cccbdb9842b14bd5ab452c85d5324f4ce3 (diff)
correct test that kdf name is not "none" or "bcrypt"
Diffstat (limited to 'usr.bin/ssh/authfile.c')
-rw-r--r--usr.bin/ssh/authfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c
index bcb170abf74..f258faaafbb 100644
--- a/usr.bin/ssh/authfile.c
+++ b/usr.bin/ssh/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.103 2014/02/02 03:44:31 djm Exp $ */
+/* $OpenBSD: authfile.c,v 1.104 2014/03/12 04:51:12 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -274,7 +274,7 @@ key_parse_private2(Buffer *blob, int type, const char *passphrase,
}
kdfname = buffer_get_cstring_ret(&copy, NULL);
if (kdfname == NULL ||
- (!strcmp(kdfname, "none") && !strcmp(kdfname, "bcrypt"))) {
+ (strcmp(kdfname, "none") != 0 && strcmp(kdfname, "bcrypt") != 0)) {
error("%s: unknown kdf name", __func__);
goto out;
}