summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-11-25 10:23:36 +0000
committerDamien Miller <djm@mindrot.org>2019-11-25 21:33:58 +1100
commit21377ec2a9378579ba4b44a681af7bbca77581f4 (patch)
tree2fdf66ea7b5c9fae0435d8aa2a6a95e35071a726 /monitor.c
parent664deef95a2e770812533439b8bdd3f3c291ae59 (diff)
upstream: redundant test
OpenBSD-Commit-ID: 38fa7806c528a590d91ae560e67bd8b246c2d7a3
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c4
1 files 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 @@
1/* $OpenBSD: monitor.c,v 1.204 2019/11/25 00:54:23 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.205 2019/11/25 10:23:36 djm Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1464,7 +1464,7 @@ mm_answer_keyverify(struct ssh *ssh, int sock, struct sshbuf *m)
1464 /* encode ret != 0 as positive integer, since we're sending u32 */ 1464 /* encode ret != 0 as positive integer, since we're sending u32 */
1465 encoded_ret = (ret != 0); 1465 encoded_ret = (ret != 0);
1466 if ((r = sshbuf_put_u32(m, encoded_ret)) != 0 || 1466 if ((r = sshbuf_put_u32(m, encoded_ret)) != 0 ||
1467 (r = sshbuf_put_u8(m, sig_details != NULL != 0)) != 0) 1467 (r = sshbuf_put_u8(m, sig_details != NULL)) != 0)
1468 fatal("%s: buffer error: %s", __func__, ssh_err(r)); 1468 fatal("%s: buffer error: %s", __func__, ssh_err(r));
1469 if (sig_details != NULL) { 1469 if (sig_details != NULL) {
1470 if ((r = sshbuf_put_u32(m, sig_details->sk_counter)) != 0 || 1470 if ((r = sshbuf_put_u32(m, sig_details->sk_counter)) != 0 ||