RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Darren Tucker 2014-06-11 07:57:58 +10:00
parent 15c254a253
commit 9f92c53bad
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6,6 +6,11 @@
the proposal if the version of OpenSSL we're using doesn't support ECC. the proposal if the version of OpenSSL we're using doesn't support ECC.
- (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] ifdef
ECC variable too. 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 20140527
- (djm) [cipher.c] Fix merge botch. - (djm) [cipher.c] Fix merge botch.

4
sshconnect2.c
View File

@ -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) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -1183,7 +1183,7 @@ pubkey_prepare(Authctxt *authctxt)
found = 0; found = 0;
TAILQ_FOREACH(id2, &files, next) { TAILQ_FOREACH(id2, &files, next) {
if (id2->key == NULL || if (id2->key == NULL ||
(id2->key->flags & KEY_FLAG_EXT) != 0) (id2->key->flags & KEY_FLAG_EXT) == 0)
continue; continue;
if (key_equal(id->key, id2->key)) { if (key_equal(id->key, id2->key)) {
TAILQ_REMOVE(&files, id, next); TAILQ_REMOVE(&files, id, next);