diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-09-09 03:31:42 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-09-09 13:38:14 +1000 |
| commit | 0ba39b93b326a7d5dfab776cc9b9d326161a9b16 (patch) | |
| tree | 8027acd6558dbd1bf5153a74d928b3c303b4c3b6 | |
| parent | be197635329feb839865fdc738e34e24afd1fca8 (diff) | |
upstream: notifier_complete(NULL, ...) is a noop, so no need to test
that ctx!=NULL; from Corinna Vinschen
OpenBSD-Commit-ID: ade2f2e9cc519d01a586800c25621d910bce384a
| -rw-r--r-- | ssh-agent.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 27d0548f..e8fb7a4f 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -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> * 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"); if (pin == NULL && !retried && sshkey_is_sk(id->key) && r == SSH_ERR_KEY_WRONG_PASSPHRASE) { - if (notifier) { - notify_complete(notifier, NULL); - notifier = NULL; - } + notify_complete(notifier, NULL); + notifier = NULL; /* XXX include sig_dest */ xasprintf(&prompt, "Enter PIN%sfor %s key %s: ", (id->key->sk_flags & SSH_SK_USER_PRESENCE_REQD) ? |