diff options
Diffstat (limited to 'sw/hash_tester.c')
| -rw-r--r-- | sw/hash_tester.c | 51 |
1 files changed, 19 insertions, 32 deletions
diff --git a/sw/hash_tester.c b/sw/hash_tester.c index 6ddc09a..3df62d3 100644 --- a/sw/hash_tester.c +++ b/sw/hash_tester.c @@ -229,39 +229,26 @@ const uint8_t SHA512_DOUBLE_DIGEST[] = int TC0() { - uint8_t board_name0[4] = "PVT1"; - uint8_t board_name1[4] = " "; - uint8_t board_version[4] = "0.10"; - - uint8_t comm_name0[4] = "eim "; - uint8_t comm_name1[4] = " "; - uint8_t comm_version[4] = "0.10"; - + uint8_t board_name0[4] = NOVENA_BOARD_NAME0; + uint8_t board_name1[4] = NOVENA_BOARD_NAME1; + uint8_t board_version[4] = NOVENA_BOARD_VERSION; uint8_t t[4]; if (!quiet) - printf("TC0-1: Reading board type, version, and dummy reg from global registers.\n"); + printf("TC0: Reading board type, version, and dummy reg from global registers.\n"); /* write current time into dummy register, then try to read it back * to make sure that we can actually write something into EIM */ (void)time((time_t *)t); - if (tc_write(BOARD_ADDR_DUMMY, (void *)&t, 4) != 0) + if (tc_write(BOARD_ADDR_DUMMY, t, 4) != 0) return 1; - if (tc_expected(BOARD_ADDR_NAME0, board_name0, 4) || + return + tc_expected(BOARD_ADDR_NAME0, board_name0, 4) || tc_expected(BOARD_ADDR_NAME1, board_name1, 4) || tc_expected(BOARD_ADDR_VERSION, board_version, 4) || - tc_expected(BOARD_ADDR_DUMMY, (void *)t, 4)) - return 1; - - if (!quiet) - printf("TC0-2: Reading name and version words from communications core.\n"); - - return - tc_expected(COMM_ADDR_NAME0, comm_name0, 4) || - tc_expected(COMM_ADDR_NAME1, comm_name1, 4) || - tc_expected(COMM_ADDR_VERSION, comm_version, 4); + tc_expected(BOARD_ADDR_DUMMY, t, 4); } /* ---------------- SHA-1 test cases ---------------- */ @@ -269,9 +256,9 @@ int TC0() /* TC1: Read name and version from SHA-1 core. */ int TC1(void) { - uint8_t name0[4] = "sha1"; - uint8_t name1[4] = " "; - uint8_t version[4] = "0.50"; + uint8_t name0[4] = SHA1_NAME0; + uint8_t name1[4] = SHA1_NAME1; + uint8_t version[4] = SHA1_VERSION; if (!quiet) printf("TC1: Reading name and version words from SHA-1 core.\n"); @@ -338,12 +325,12 @@ int TC3(void) /* TC4: Read name and version from SHA-256 core. */ int TC4(void) { - uint8_t name0[4] = "sha2"; - uint8_t name1[4] = "-256"; - uint8_t version[4] = "0.80"; + uint8_t name0[4] = SHA256_NAME0; + uint8_t name1[4] = SHA256_NAME1; + uint8_t version[4] = SHA256_VERSION; if (!quiet) - printf("TC4: Reading name, type and version words from SHA-256 core.\n"); + printf("TC4: Reading name and version words from SHA-256 core.\n"); return tc_expected(SHA256_ADDR_NAME0, name0, 4) || @@ -455,12 +442,12 @@ int TC7() /* TC8: Read name and version from SHA-512 core. */ int TC8() { - uint8_t name0[4] = "sha2"; - uint8_t name1[4] = "-512"; - uint8_t version[4] = "0.80"; + uint8_t name0[4] = SHA512_NAME0; + uint8_t name1[4] = SHA512_NAME1; + uint8_t version[4] = SHA512_VERSION; if (!quiet) - printf("TC8: Reading name, type and version words from SHA-512 core.\n"); + printf("TC8: Reading name and version words from SHA-512 core.\n"); return tc_expected(SHA512_ADDR_NAME0, name0, 4) || |