[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  23fa978994b52ac60c1fcbe1e094d65d7c78c7bb (commit)
      from  3be08e301146fc449315b7061d086edddb186850 (commit)


- Log -----------------------------------------------------------------
commit 23fa978994b52ac60c1fcbe1e094d65d7c78c7bb
Author: AlexDenisov <1101.debian at gmail.com>
Date:   Sat Oct 28 13:17:06 2017 +0200

    [packettest] Fix misplaced parentheses
    
    Thanks to David Benjamin for suggesting the fix needed by this fix.
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4607)

-----------------------------------------------------------------------

Summary of changes:
 test/packettest.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/packettest.c b/test/packettest.c
index 83d1ccd..98b9ec4 100644
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -18,12 +18,12 @@ static int test_PACKET_remaining(void)
 {
     PACKET pkt;
 
-    if (!TEST_true(PACKET_buf_init(&pkt, smbuf, sizeof(smbuf))
+    if (!TEST_true(PACKET_buf_init(&pkt, smbuf, sizeof(smbuf)))
             || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
             || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 1))
             || !TEST_size_t_eq(PACKET_remaining(&pkt), 1)
             || !TEST_true(PACKET_forward(&pkt, 1))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), 0)))
+            || !TEST_size_t_eq(PACKET_remaining(&pkt), 0))
         return 0;
 
     return 1;
@@ -33,13 +33,13 @@ static int test_PACKET_end(void)
 {
     PACKET pkt;
 
-    if (!TEST_true(PACKET_buf_init(&pkt, smbuf, sizeof(smbuf))
+    if (!TEST_true(PACKET_buf_init(&pkt, smbuf, sizeof(smbuf)))
             || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
-            || !TEST_ptr_ne(PACKET_end(&pkt), smbuf + BUF_LEN)
+            || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN)
             || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 1))
             || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN)
             || !TEST_true(PACKET_forward(&pkt, 1))
-            || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN)))
+            || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN))
         return 0;
 
     return 1;
@@ -430,9 +430,9 @@ static int test_PACKET_as_length_prefixed_1(void)
             || !TEST_true(PACKET_buf_init(&exact_pkt, buf1, len + 1))
             || !TEST_false(PACKET_as_length_prefixed_1(&pkt, &subpkt))
             || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
-            || !TEST_true(PACKET_as_length_prefixed_1(&exact_pkt, &subpkt)
+            || !TEST_true(PACKET_as_length_prefixed_1(&exact_pkt, &subpkt))
             || !TEST_size_t_eq(PACKET_remaining(&exact_pkt), 0)
-            || !TEST_size_t_eq(PACKET_remaining(&subpkt), len)))
+            || !TEST_size_t_eq(PACKET_remaining(&subpkt), len))
         return 0;
 
     return 1;