From 9c97b6af8e052ab5ffe0f9096fadc8f9a4d0ed0f Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 18 Oct 2024 05:45:40 +0000 Subject: [PATCH] upstream: remove duplicate check; GHPR392 from Pedro Martelletto OpenBSD-Commit-ID: 597ab7dd3f0e78939d2659fc1904d0f39ee95487 --- sshconnect2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sshconnect2.c b/sshconnect2.c index 11fcdea8aff1..a69c4da18773 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.375 2024/09/09 02:39:57 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.376 2024/10/18 05:45:40 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1885,10 +1885,8 @@ userauth_pubkey(struct ssh *ssh) debug("Trying private key: %s", id->filename); id->key = load_identity_file(id); if (id->key != NULL) { - if (id->key != NULL) { - id->isprivate = 1; - sent = sign_and_send_pubkey(ssh, id); - } + id->isprivate = 1; + sent = sign_and_send_pubkey(ssh, id); sshkey_free(id->key); id->key = NULL; id->isprivate = 0;