4861. [bug] The isc_crc64 unit test was not endian independent.

                        [RT #46973]

(cherry picked from commit 0ce212b9f55853f5b2a279cf5008aeee85c1cc8c)

diff --git a/CHANGES b/CHANGES
index cf2ae31d5f3b3cba68857fbf12edc3eb4eab0d5c..71c05f6320c7caf8767acdce2c339e5c1230a913 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4861.  [bug]           The isc_crc64 unit test was not endian independent.
+                       [RT #46973]
+
 4860.  [bug]           isc_int8_t should be signed char.  [RT #46973]
 
 4859.  [bug]           A loop was possible when attempting to validate

diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c
index 207a05bf5d690740bea8c575a8f863cf985629da..d2127b4c2b6ce88977226fb16bf6c84837a9232b 100644 (file)
--- a/lib/isc/tests/hash_test.c
+++ b/lib/isc/tests/hash_test.c
@@ -1798,29 +1798,29 @@ ATF_TC_BODY(isc_crc64, tc) {
                },
                {
                        TEST_INPUT("a"),
-                       "0x9AA9C0AC27F473CE", 1
+                       "0xCE73F427ACC0A99A", 1
                },
                {
                        TEST_INPUT("abc"),
-                       "0x0297F4F93A818B04", 1
+                       "0x048B813AF9F49702", 1
                },
                {
                        TEST_INPUT("message digest"),
-                       "0xF47B357AEAF97352", 1
+                       "0x5273F9EA7A357BF4", 1
                },
                {
                        TEST_INPUT("abcdefghijklmnopqrstuvwxyz"),
-                       "0xA1AA8B21F979F059", 1
+                       "0x59F079F9218BAAA1", 1
                },
                {
                        TEST_INPUT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklm"
                                   "nopqrstuvwxyz0123456789"),
-                       "0xFBB6781EF7A86DA3", 1
+                       "0xA36DA8F71E78B6FB", 1
                },
                {
                        TEST_INPUT("123456789012345678901234567890123456789"
                                   "01234567890123456789012345678901234567890"),
-                       "0x4A87E7C873EBE581", 1
+                       "0x81E5EB73C8E7874A", 1
                },
                { NULL, 0, NULL, 1 }
        };
@@ -1835,7 +1835,8 @@ ATF_TC_BODY(isc_crc64, tc) {
                                       testcase->input_len);
                }
                isc_crc64_final(&crc);
-               tohexstr((unsigned char *) &crc, sizeof(crc), str, sizeof(str));
+               snprintf(str, sizeof(str),
+                        "0x%016" ISC_PRINT_QUADFORMAT "X", crc);
                ATF_CHECK_STREQ(str, testcase->result);
 
                testcase++;