upstream commit

Fix occurrences of "r = func() != 0" which result in the
 wrong error codes being returned due to != having higher precedence than =.

ok deraadt@ markus@

Upstream-ID: 5fc35c9fc0319cc6fca243632662d2f06b5fd840

diff --git a/authfd.c b/authfd.c
index eaa1426485d017236757f293f0ccd168a224565d..12bf1251f68dab275d2fa0d3c98230ba2be31c5d 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.98 2015/07/03 03:43:18 djm Exp $ */
+/* $OpenBSD: authfd.c,v 1.99 2015/09/02 07:51:12 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -454,7 +454,7 @@ ssh_agent_sign(int sock, struct sshkey *key,
            (r = sshbuf_put_string(msg, data, datalen)) != 0 ||
            (r = sshbuf_put_u32(msg, flags)) != 0)
                goto out;
-       if ((r = ssh_request_reply(sock, msg, msg) != 0))
+       if ((r = ssh_request_reply(sock, msg, msg)) != 0)
                goto out;
        if ((r = sshbuf_get_u8(msg, &type)) != 0)
                goto out;

diff --git a/krl.c b/krl.c
index 4075df853fffc1440aaf2315789d0dbdc7e5ded8..570a4f7474848e83e8094a502162d887ed10314c 100644 (file)
--- a/krl.c
+++ b/krl.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $OpenBSD: krl.c,v 1.33 2015/07/03 03:43:18 djm Exp $ */
+/* $OpenBSD: krl.c,v 1.34 2015/09/02 07:51:12 jsg Exp $ */
 
 #include "includes.h"
 
@@ -723,7 +723,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf,
        if ((r = sshbuf_put(buf, KRL_MAGIC, sizeof(KRL_MAGIC) - 1)) != 0 ||
            (r = sshbuf_put_u32(buf, KRL_FORMAT_VERSION)) != 0 ||
            (r = sshbuf_put_u64(buf, krl->krl_version)) != 0 ||
-           (r = sshbuf_put_u64(buf, krl->generated_date) != 0) ||
+           (r = sshbuf_put_u64(buf, krl->generated_date)) != 0 ||
            (r = sshbuf_put_u64(buf, krl->flags)) != 0 ||
            (r = sshbuf_put_string(buf, NULL, 0)) != 0 ||
            (r = sshbuf_put_cstring(buf, krl->comment)) != 0)

diff --git a/monitor.c b/monitor.c
index 93489839215516f7464c6aacdf336dacf05932c4..e912a89cf8eb3aeba4247c4482554a5c2da5b029 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.151 2015/08/21 23:29:31 deraadt Exp $ */
+/* $OpenBSD: monitor.c,v 1.152 2015/09/02 07:51:12 jsg Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -722,7 +722,7 @@ mm_answer_sign(int sock, Buffer *m)
                        fatal("%s: sshbuf_new", __func__);
                if ((r = sshbuf_put_cstring(sigbuf, proof_req)) != 0 ||
                    (r = sshbuf_put_string(sigbuf, session_id2,
-                   session_id2_len) != 0) ||
+                   session_id2_len)) != 0 ||
                    (r = sshkey_puts(key, sigbuf)) != 0)
                        fatal("%s: couldn't prepare private key "
                            "proof buffer: %s", __func__, ssh_err(r));

diff --git a/sshkey.c b/sshkey.c
index 32dd8f2254a2b347990e5fef872d2ddf0ffb402f..1f714c37f8080aa887757180951ad13e2da3fc16 100644 (file)
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.21 2015/08/19 23:19:01 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.22 2015/09/02 07:51:12 jsg Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -1717,7 +1717,7 @@ sshkey_cert_copy(const struct sshkey *from_key, struct sshkey *to_key)
 
        if ((ret = sshbuf_putb(to->certblob, from->certblob)) != 0 ||
            (ret = sshbuf_putb(to->critical, from->critical)) != 0 ||
-           (ret = sshbuf_putb(to->extensions, from->extensions) != 0))
+           (ret = sshbuf_putb(to->extensions, from->extensions)) != 0)
                return ret;
 
        to->serial = from->serial;
@@ -2701,7 +2701,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
                        goto out;
                }
                if ((r = sshkey_ec_validate_public(EC_KEY_get0_group(k->ecdsa),
-                   EC_KEY_get0_public_key(k->ecdsa)) != 0) ||
+                   EC_KEY_get0_public_key(k->ecdsa))) != 0 ||
                    (r = sshkey_ec_validate_private(k->ecdsa)) != 0)
                        goto out;
                break;
@@ -2719,7 +2719,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
                        goto out;
                }
                if ((r = sshkey_ec_validate_public(EC_KEY_get0_group(k->ecdsa),
-                   EC_KEY_get0_public_key(k->ecdsa)) != 0) ||
+                   EC_KEY_get0_public_key(k->ecdsa))) != 0 ||
                    (r = sshkey_ec_validate_private(k->ecdsa)) != 0)
                        goto out;
                break;
@@ -2741,10 +2741,10 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
        case KEY_RSA_CERT:
                if ((r = sshkey_froms(buf, &k)) != 0 ||
                    (r = sshkey_add_private(k)) != 0 ||
-                   (r = sshbuf_get_bignum2(buf, k->rsa->d) != 0) ||
-                   (r = sshbuf_get_bignum2(buf, k->rsa->iqmp) != 0) ||
-                   (r = sshbuf_get_bignum2(buf, k->rsa->p) != 0) ||
-                   (r = sshbuf_get_bignum2(buf, k->rsa->q) != 0) ||
+                   (r = sshbuf_get_bignum2(buf, k->rsa->d)) != 0 ||
+                   (r = sshbuf_get_bignum2(buf, k->rsa->iqmp)) != 0 ||
+                   (r = sshbuf_get_bignum2(buf, k->rsa->p)) != 0 ||
+                   (r = sshbuf_get_bignum2(buf, k->rsa->q)) != 0 ||
                    (r = rsa_generate_additional_parameters(k->rsa)) != 0)
                        goto out;
                break;
@@ -3431,9 +3431,9 @@ sshkey_private_rsa1_to_blob(struct sshkey *key, struct sshbuf *blob,
 
        /* Store public key.  This will be in plain text. */
        if ((r = sshbuf_put_u32(encrypted, BN_num_bits(key->rsa->n))) != 0 ||
-           (r = sshbuf_put_bignum1(encrypted, key->rsa->n) != 0) ||
-           (r = sshbuf_put_bignum1(encrypted, key->rsa->e) != 0) ||
-           (r = sshbuf_put_cstring(encrypted, comment) != 0))
+           (r = sshbuf_put_bignum1(encrypted, key->rsa->n)) != 0 ||
+           (r = sshbuf_put_bignum1(encrypted, key->rsa->e)) != 0 ||
+           (r = sshbuf_put_cstring(encrypted, comment)) != 0)
                goto out;
 
        /* Allocate space for the private part of the key in the buffer. */