summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2014-06-05 22:17:50 +0000
committerdjm <djm@openbsd.org>2014-06-05 22:17:50 +0000
commit60fa565ed3706da5bc83139f527ad9ca7ad670bc (patch)
treeb7f1fcb59d20a8ce0abd20a86a00f8a061269dbd /usr.bin/ssh/sshconnect2.c
parentReset properly when c0-change-trigger is increased from zero so panes (diff)
downloadwireguard-openbsd-60fa565ed3706da5bc83139f527ad9ca7ad670bc.tar.xz
wireguard-openbsd-60fa565ed3706da5bc83139f527ad9ca7ad670bc.zip
fix inverted test that caused PKCS#11 keys that were explicitly listed
not to be preferred. Reported by Dirk-Willem van Gulik
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index e0d2dc990a6..ff07e5969fc 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.207 2014/04/29 18:01:49 markus Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.208 2014/06/05 22:17:50 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1177,7 +1177,7 @@ pubkey_prepare(Authctxt *authctxt)
found = 0;
TAILQ_FOREACH(id2, &files, next) {
if (id2->key == NULL ||
- (id2->key->flags & KEY_FLAG_EXT) != 0)
+ (id2->key->flags & KEY_FLAG_EXT) == 0)
continue;
if (key_equal(id->key, id2->key)) {
TAILQ_REMOVE(&files, id, next);