upstream: remove redundant ssh!=NULL check; we'd already

dereferenced it

OpenBSD-Commit-ID: 852bf12591ec5a9fb12dcbde9b1fd3945ad0df3c

diff --git a/packet.c b/packet.c
index fd14f0009e6759ef676cc214ca52e11f5c46a095..fdb8783bc3150e5180bfb7471ea9cbdbfc6d3d05 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.309 2023/03/03 10:23:42 dtucker Exp $ */
+/* $OpenBSD: packet.c,v 1.310 2023/04/06 03:21:31 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1890,7 +1890,7 @@ sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap)
        case SSH_ERR_NO_COMPRESS_ALG_MATCH:
        case SSH_ERR_NO_KEX_ALG_MATCH:
        case SSH_ERR_NO_HOSTKEY_ALG_MATCH:
-               if (ssh && ssh->kex && ssh->kex->failed_choice) {
+               if (ssh->kex && ssh->kex->failed_choice) {
                        ssh_packet_clear_keys(ssh);
                        errno = oerrno;
                        logdie("Unable to negotiate with %s: %s. "