diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2014-06-11 07:57:58 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2014-06-11 07:57:58 +1000 |
| commit | 9f92c53bad04a89067756be8198d4ec2d8a08875 (patch) | |
| tree | da427ae4c4d641b7f0561bc1ecf060df786e682c | |
| parent | 15c254a25394f96643da2ad0f674acdc51e89856 (diff) | |
- djm@cvs.openbsd.org 2014/06/05 22:17:50
[sshconnect2.c]
fix inverted test that caused PKCS#11 keys that were explicitly listed
not to be preferred. Reported by Dirk-Willem van Gulik
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sshconnect2.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -6,6 +6,11 @@ the proposal if the version of OpenSSL we're using doesn't support ECC. - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef ECC variable too. + - (dtucker) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2014/06/05 22:17:50 + [sshconnect2.c] + fix inverted test that caused PKCS#11 keys that were explicitly listed + not to be preferred. Reported by Dirk-Willem van Gulik 20140527 - (djm) [cipher.c] Fix merge botch. diff --git a/sshconnect2.c b/sshconnect2.c index f71b7d22..65839843 100644 --- a/sshconnect2.c +++ b/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. @@ -1183,7 +1183,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); |