From 21377ec2a9378579ba4b44a681af7bbca77581f4 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Mon, 25 Nov 2019 10:23:36 +0000 Subject: [PATCH] upstream: redundant test OpenBSD-Commit-ID: 38fa7806c528a590d91ae560e67bd8b246c2d7a3 --- monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index d4be7409e..64eca98d6 100644 --- a/monitor.c +++ b/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.204 2019/11/25 00:54:23 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.205 2019/11/25 10:23:36 djm Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -1464,7 +1464,7 @@ mm_answer_keyverify(struct ssh *ssh, int sock, struct sshbuf *m) /* encode ret != 0 as positive integer, since we're sending u32 */ encoded_ret = (ret != 0); if ((r = sshbuf_put_u32(m, encoded_ret)) != 0 || - (r = sshbuf_put_u8(m, sig_details != NULL != 0)) != 0) + (r = sshbuf_put_u8(m, sig_details != NULL)) != 0) fatal("%s: buffer error: %s", __func__, ssh_err(r)); if (sig_details != NULL) { if ((r = sshbuf_put_u32(m, sig_details->sk_counter)) != 0 ||