diff options
author | Damien Miller <djm@mindrot.org> | 2014-04-20 13:00:28 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-04-20 13:00:28 +1000 |
commit | 3819519288b2b3928c6882f5883b0f55148f4fc0 (patch) | |
tree | b160c5e1c97cbcb0ef86ad853aedcdf5276186ad /authfile.c | |
parent | 8f9cd709c7cf0655d414306a0ed28306b33802be (diff) | |
download | openssh-git-3819519288b2b3928c6882f5883b0f55148f4fc0.tar.gz |
- djm@cvs.openbsd.org 2014/03/12 04:51:12
[authfile.c]
correct test that kdf name is not "none" or "bcrypt"
Diffstat (limited to 'authfile.c')
-rw-r--r-- | authfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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(©, 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; } |