From 7cabd746e9e49c0d88757640823b1b1ed887a4a2 Mon Sep 17 00:00:00 2001 From: djm Date: Fri, 9 Sep 2022 03:31:42 +0000 Subject: [PATCH] notifier_complete(NULL, ...) is a noop, so no need to test that ctx!=NULL; from Corinna Vinschen --- usr.bin/ssh/ssh-agent.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 27f1eda045e..426bdfd5b59 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -824,10 +824,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) ? -- 2.20.1