summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-06-11 07:57:58 +1000
committerDarren Tucker <dtucker@zip.com.au>2014-06-11 07:57:58 +1000
commit9f92c53bad04a89067756be8198d4ec2d8a08875 (patch)
treeda427ae4c4d641b7f0561bc1ecf060df786e682c
parent15c254a25394f96643da2ad0f674acdc51e89856 (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--ChangeLog5
-rw-r--r--sshconnect2.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e2171ec1b..c04af4aa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
6 the proposal if the version of OpenSSL we're using doesn't support ECC. 6 the proposal if the version of OpenSSL we're using doesn't support ECC.
7 - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef 7 - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef
8 ECC variable too. 8 ECC variable too.
9 - (dtucker) OpenBSD CVS Sync
10 - djm@cvs.openbsd.org 2014/06/05 22:17:50
11 [sshconnect2.c]
12 fix inverted test that caused PKCS#11 keys that were explicitly listed
13 not to be preferred. Reported by Dirk-Willem van Gulik
9 14
1020140527 1520140527
11 - (djm) [cipher.c] Fix merge botch. 16 - (djm) [cipher.c] Fix merge botch.
diff --git a/sshconnect2.c b/sshconnect2.c
index f71b7d226..658398436 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.207 2014/04/29 18:01:49 markus Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.208 2014/06/05 22:17:50 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1183,7 +1183,7 @@ pubkey_prepare(Authctxt *authctxt)
1183 found = 0; 1183 found = 0;
1184 TAILQ_FOREACH(id2, &files, next) { 1184 TAILQ_FOREACH(id2, &files, next) {
1185 if (id2->key == NULL || 1185 if (id2->key == NULL ||
1186 (id2->key->flags & KEY_FLAG_EXT) != 0) 1186 (id2->key->flags & KEY_FLAG_EXT) == 0)
1187 continue; 1187 continue;
1188 if (key_equal(id->key, id2->key)) { 1188 if (key_equal(id->key, id2->key)) {
1189 TAILQ_REMOVE(&files, id, next); 1189 TAILQ_REMOVE(&files, id, next);