From 3819519288b2b3928c6882f5883b0f55148f4fc0 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 20 Apr 2014 13:00:28 +1000
Subject:    - djm@cvs.openbsd.org 2014/03/12 04:51:12      [authfile.c]     
 correct test that kdf name is not "none" or "bcrypt"

---
 authfile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'authfile.c')

diff --git a/authfile.c b/authfile.c
index d7eaa9de..0e97ba4e 100644
--- a/authfile.c
+++ b/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
@@ -281,7 +281,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;
 	}
-- 
cgit v1.2.1