Use torture_assert_mem_equal() in a couple more places.

diff --git a/source/lib/registry/tests/registry.c b/source/lib/registry/tests/registry.c
index 1780b4e7727991cd30cffa7d8fadef21574e14b5..b19a6abffb91bdf9a7e638115547a662df8f7d46 100644 (file)
--- a/source/lib/registry/tests/registry.c
+++ b/source/lib/registry/tests/registry.c
@@ -496,7 +496,7 @@ static bool test_list_values(struct torture_context *tctx, void *_data)
 
        torture_assert_str_equal(tctx, name, "bar", "value name");
        torture_assert_int_equal(tctx, 4, data.length, "value length");
-       torture_assert(tctx, memcmp(data.data, &value, 4) == 0,
+       torture_assert_mem_equal(tctx, data.data, &value, 4,
                       "value content");
        torture_assert_int_equal(tctx, REG_DWORD, type, "value type");
 

diff --git a/source/lib/socket/testsuite.c b/source/lib/socket/testsuite.c
index 6d4d81a884bb5b167efb99d775fc37ea533e39fd..813412c7bc83bb8eddc23859dbea17f7019dc5c0 100644 (file)
--- a/source/lib/socket/testsuite.c
+++ b/source/lib/socket/testsuite.c
@@ -86,7 +86,7 @@ static bool test_udp(struct torture_context *tctx)
 
        torture_assert_int_equal(tctx, nread, size, "Unexpected recvfrom size");
 
-       torture_assert(tctx, memcmp(blob2.data, blob.data, size) == 0,
+       torture_assert_mem_equal(tctx, blob2.data, blob.data, size,
                "Bad data in recvfrom");
 
        generate_random_buffer(blob.data, blob.length);
@@ -104,7 +104,7 @@ static bool test_udp(struct torture_context *tctx)
        torture_assert_int_equal(tctx, from_addr->port, srv_addr->port, 
                                   "Unexpected recvfrom port");
 
-       torture_assert(tctx, memcmp(blob2.data, blob.data, size) == 0, 
+       torture_assert_mem_equal(tctx, blob2.data, blob.data, size,
                "Bad data in recvfrom");
 
        talloc_free(sock1);
@@ -181,7 +181,7 @@ static bool test_tcp(struct torture_context *tctx)
 
        torture_assert_int_equal(tctx, nread, size, "Unexpected recvfrom size");
 
-       torture_assert(tctx, memcmp(blob2.data, blob.data, size) == 0, 
+       torture_assert_mem_equal(tctx, blob2.data, blob.data, size, 
                                   "Bad data in recv");
        return true;
 }

diff --git a/source/lib/util/tests/file.c b/source/lib/util/tests/file.c
index fe87293671ec82613e646e4257e42a37da580e5a..3377e833dc3e038fcb135c385967dc4946705a7a 100644 (file)
--- a/source/lib/util/tests/file.c
+++ b/source/lib/util/tests/file.c
@@ -45,9 +45,9 @@ static bool test_file_load_save(struct torture_context *tctx)
        data = file_load(TEST_FILENAME, &len, mem_ctx);
        torture_assert(tctx, data, "loading file");
 
-       torture_assert(tctx, len == strlen(TEST_DATA), "Length");
+       torture_assert_int_equal(tctx, len, strlen(TEST_DATA), "Length");
        
-       torture_assert(tctx, memcmp(data, TEST_DATA, len) == 0, "Contents");
+       torture_assert_mem_equal(tctx, data, TEST_DATA, len, "Contents");
 
        unlink(TEST_FILENAME);
        return true;

diff --git a/source/torture/auth/ntlmssp.c b/source/torture/auth/ntlmssp.c
index 9366de986a4918fd9fae488a925eb68963c828fd..917a24ad598b6379c29136918979d3d38109b7b2 100644 (file)
--- a/source/torture/auth/ntlmssp.c
+++ b/source/torture/auth/ntlmssp.c
@@ -69,7 +69,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 
        torture_assert_int_equal(tctx, sig.length, expected_sig.length, "Wrong sig length");
 
-       torture_assert(tctx, 0 == memcmp(sig.data, expected_sig.data, sig.length),
+       torture_assert_mem_equal(tctx, sig.data, expected_sig.data, sig.length,
                                   "data mismatch");
 
        torture_assert_ntstatus_equal(tctx, 
@@ -123,7 +123,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 
        torture_assert_int_equal(tctx, sig.length, expected_sig.length, "Wrong sig length");
 
-       torture_assert(tctx,  0 == memcmp(sig.data+8, expected_sig.data+8, sig.length-8),
+       torture_assert_mem_equal(tctx, sig.data+8, expected_sig.data+8, sig.length-8,
                                   "data mismatch");
 
        torture_assert_ntstatus_equal(tctx, 

diff --git a/source/torture/basic/base.c b/source/torture/basic/base.c
index ac71d14116b1bac0be95440572cf24229ef72386..3a3a7c2fd5998ce028b2bdd92f18ee6a11eb90ca 100644 (file)
--- a/source/torture/basic/base.c
+++ b/source/torture/basic/base.c
@@ -590,7 +590,7 @@ static bool rw_torture2(struct torture_context *tctx,
                        break;
                }
 
-               torture_assert(tctx, memcmp(buf_rd, buf, buf_size) == 0, 
+               torture_assert_mem_equal(tctx, buf_rd, buf, buf_size, 
                        "read/write compare failed\n");
        }
 

diff --git a/source/torture/ndr/netlogon.c b/source/torture/ndr/netlogon.c
index 2f01a9d00903f917e0b61e39f225d7ef48db66a9..f498335bda04d0f3d359b370e5c4703603c7884d 100644 (file)
--- a/source/torture/ndr/netlogon.c
+++ b/source/torture/ndr/netlogon.c
@@ -46,7 +46,7 @@ static bool netrserverauthenticate3_in_check(struct torture_context *tctx,
        torture_assert_int_equal(tctx, r->in.secure_channel_type, 2, "secure channel type");
        torture_assert_str_equal(tctx, r->in.computer_name, "NATIVE-2K", "computer name");
        torture_assert_int_equal(tctx, *r->in.negotiate_flags, 0x6007ffff, "negotiate flags");
-       torture_assert(tctx, memcmp(cred_expected, r->in.credentials->data, 8) == 0, "credentials");
+       torture_assert_mem_equal(tctx, cred_expected, r->in.credentials->data, 8, "credentials");
        return true;
 }
 
@@ -59,7 +59,7 @@ static bool netrserverauthenticate3_out_check(struct torture_context *tctx,
                                                                                        struct netr_ServerAuthenticate3 *r)
 {
        uint8_t cred_expected[8] = { 0x22, 0x0c, 0x86, 0x8a, 0xe9, 0x92, 0x93, 0xc9 };
-       torture_assert(tctx, memcmp(cred_expected, r->out.credentials->data, 8) == 0, "credentials");
+       torture_assert_mem_equal(tctx, cred_expected, r->out.credentials->data, 8, "credentials");
        torture_assert_int_equal(tctx, *r->out.negotiate_flags, 0x6007ffff, "negotiate flags");
        torture_assert_int_equal(tctx, *r->out.rid, 0x454, "rid");
        torture_assert_ntstatus_ok(tctx, r->out.result, "return code");
@@ -85,7 +85,7 @@ static bool netrserverreqchallenge_in_check(struct torture_context *tctx,
        uint8_t cred_expected[8] = { 0xa3, 0x2c, 0xa2, 0x95, 0x40, 0xcc, 0xb7, 0xbb };
        torture_assert_str_equal(tctx, r->in.server_name, "\\\\NATIVE-DC.NATIVE.BASE", "server name");
        torture_assert_str_equal(tctx, r->in.computer_name, "NATIVE-2K", "account name");
-       torture_assert(tctx, memcmp(cred_expected, r->in.credentials->data, 8) == 0, "credentials");
+       torture_assert_mem_equal(tctx, cred_expected, r->in.credentials->data, 8, "credentials");
 
        return true;
 }
@@ -98,7 +98,7 @@ static bool netrserverreqchallenge_out_check(struct torture_context *tctx,
                                                                                        struct netr_ServerReqChallenge *r)
 {
        uint8_t cred_expected[8] = { 0x22, 0xfc, 0xc1, 0x17, 0xc0, 0xae, 0x27, 0x8e };
-       torture_assert(tctx, memcmp(cred_expected, r->out.credentials->data, 8) == 0, "credentials");
+       torture_assert_mem_equal(tctx, cred_expected, r->out.credentials->data, 8, "credentials");
        torture_assert_ntstatus_ok(tctx, r->out.result, "return code");
 
        return true;