diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-04-17 03:38:47 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-04-17 14:03:36 +1000 |
commit | 54688e937a69c7aebef8a3d50cbd4c6345bab2ca (patch) | |
tree | 321dd8603542388d140c46a9ede9ec2cfa59ce9c /sshconnect2.c | |
parent | 267cbc87b5b6e78973ac4d3c7a6f807ed226928c (diff) |
upstream: fix reversed test that caused IdentitiesOnly=yes to not
apply to keys loaded from a PKCS11Provider; bz3141, ok dtucker@
OpenBSD-Commit-ID: e3dd6424b94685671fe84c9b9dbe352fb659f677
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index af00fb30c..1a6545edf 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.320 2020/02/06 22:48:23 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.321 2020/04/17 03:38:47 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. |
@@ -1671,7 +1671,7 @@ pubkey_prepare(Authctxt *authctxt) | |||
1671 | found = 0; | 1671 | found = 0; |
1672 | TAILQ_FOREACH(id2, &files, next) { | 1672 | TAILQ_FOREACH(id2, &files, next) { |
1673 | if (id2->key == NULL || | 1673 | if (id2->key == NULL || |
1674 | (id2->key->flags & SSHKEY_FLAG_EXT) == 0) | 1674 | (id2->key->flags & SSHKEY_FLAG_EXT) != 0) |
1675 | continue; | 1675 | continue; |
1676 | if (sshkey_equal(id->key, id2->key)) { | 1676 | if (sshkey_equal(id->key, id2->key)) { |
1677 | TAILQ_REMOVE(&files, id, next); | 1677 | TAILQ_REMOVE(&files, id, next); |