summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-01-30 00:32:28 +0000
committerDamien Miller <djm@mindrot.org>2017-01-30 12:04:10 +1100
commit326e2fae9f2e3e067b5651365eba86b35ee5a6b2 (patch)
tree622fecc6acd66c8b17d7c075c7ee6dcbcd7615de
parent3e032a95e46bfaea9f9e857678ac8fa5f63997fb (diff)
upstream commit
misplaced braces in test; from Karsten Weiss Upstream-ID: f7b794074d3aae8e35b69a91d211c599c94afaae
-rw-r--r--sshconnect2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index badc000ce..dd47b75d3 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.252 2017/01/30 00:32:03 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.253 2017/01/30 00:32:28 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1632,7 +1632,7 @@ ssh_keysign(struct sshkey *key, u_char **sigp, size_t *lenp,
1632 if ((b = sshbuf_new()) == NULL) 1632 if ((b = sshbuf_new()) == NULL)
1633 fatal("%s: sshbuf_new failed", __func__); 1633 fatal("%s: sshbuf_new failed", __func__);
1634 /* send # of sock, data to be signed */ 1634 /* send # of sock, data to be signed */
1635 if ((r = sshbuf_put_u32(b, sock) != 0) || 1635 if ((r = sshbuf_put_u32(b, sock)) != 0 ||
1636 (r = sshbuf_put_string(b, data, datalen)) != 0) 1636 (r = sshbuf_put_string(b, data, datalen)) != 0)
1637 fatal("%s: buffer error: %s", __func__, ssh_err(r)); 1637 fatal("%s: buffer error: %s", __func__, ssh_err(r));
1638 if (ssh_msg_send(to[1], version, b) == -1) 1638 if (ssh_msg_send(to[1], version, b) == -1)