tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: notifier_complete(NULL, ...) is a noop, so no need to test 

that ctx!=NULL; from Corinna Vinschen

OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a
This commit is contained in:
djm@openbsd.org 2022-09-09 03:31:42 +00:00 committed by Damien Miller
parent be19763532
commit 0ba39b93b3
No known key found for this signature in database
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.288 2022/04/29 03:13:32 djm Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.289 2022/09/09 03:31:42 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -837,10 +837,8 @@ process_sign_request2(SocketEntry *e)
debug_fr(r, "sshkey_sign"); debug_fr(r, "sshkey_sign");
if (pin == NULL && !retried && sshkey_is_sk(id->key) && if (pin == NULL && !retried && sshkey_is_sk(id->key) &&
r == SSH_ERR_KEY_WRONG_PASSPHRASE) { r == SSH_ERR_KEY_WRONG_PASSPHRASE) {
if (notifier) { notify_complete(notifier, NULL);
notify_complete(notifier, NULL); notifier = NULL;
notifier = NULL;
}
/* XXX include sig_dest */ /* XXX include sig_dest */
xasprintf(&prompt, "Enter PIN%sfor %s key %s: ", xasprintf(&prompt, "Enter PIN%sfor %s key %s: ",
(id->key->sk_flags & SSH_SK_USER_PRESENCE_REQD) ? (id->key->sk_flags & SSH_SK_USER_PRESENCE_REQD) ?