X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c517056585ce9699f0d8b3be6423ef953e90c47b..7ef8de40e0bcdd931f5a400fd586fee3a1aaaeea:/tests/test_crypto.cpp?ds=inline diff --git a/tests/test_crypto.cpp b/tests/test_crypto.cpp index e8ff4c3c..902955cf 100644 --- a/tests/test_crypto.cpp +++ b/tests/test_crypto.cpp @@ -17,70 +17,12 @@ namespace { -void dumpCheckCtx(const std::string& nameA, const std::string& nameB, const BLOWFISH_CTX& a, const BLOWFISH_CTX& b) -{ - printf("CTX '%s': CTX '%s':\n", nameA.c_str(), nameB.c_str()); - const auto* ptrA = reinterpret_cast(&a); - const auto* ptrB = reinterpret_cast(&b); - size_t row = 0; - while (row * 16 < sizeof(a)) - { - for (size_t j = 0; j < 8; ++j) - if (row * 16 + j < sizeof(a)) - { - if (ptrA[row * 16 + j] == ptrB[row * 16 + j]) - printf(" %02x", static_cast(ptrA[row * 16 + j])); - else - printf(" \033[31m%02x\033[0m", static_cast(ptrA[row * 16 + j])); - } - else - printf(" "); - printf(" "); - for (size_t j = 0; j < 8; ++j) - if (row * 16 + j + 8 < sizeof(a)) - { - if (ptrA[row * 16 + j + 8] == ptrB[row * 16 + j + 8]) - printf(" %02x", static_cast(ptrA[row * 16 + j + 8])); - else - printf(" \033[31m%02x\033[0m", static_cast(ptrA[row * 16 + j + 8])); - } - else - printf(" "); - printf(" | "); - for (size_t j = 0; j < 8; ++j) - if (row * 16 + j < sizeof(b)) - { - if (ptrA[row * 16 + j] == ptrB[row * 16 + j]) - printf(" %02x", static_cast(ptrB[row * 16 + j])); - else - printf(" \033[31m%02x\033[0m", static_cast(ptrB[row * 16 + j])); - } - else - printf(" "); - printf(" "); - for (size_t j = 0; j < 8; ++j) - if (row * 16 + j + 8 < sizeof(b)) - { - if (ptrA[row * 16 + j + 8] == ptrB[row * 16 + j + 8]) - printf(" %02x", static_cast(ptrB[row * 16 + j + 8])); - else - printf(" \033[31m%02x\033[0m", static_cast(ptrB[row * 16 + j + 8])); - } - else - printf(" "); - printf("\n"); - ++row; - } - printf("\n\n"); -} - bool equalCtx(const BLOWFISH_CTX& a, const BLOWFISH_CTX& b) { - for (size_t i = 0; i < sizeof(a.P); ++i) + for (size_t i = 0; i < 18; ++i) if (a.P[i] != b.P[i]) { printf("Failed for P at %ld: 0x%x != 0x%x\n", i, a.P[i], b.P[i]); - dumpCheckCtx("a", "b", a, b); return false; } for (size_t i = 0; i < 4; ++i) @@ -88,7 +30,6 @@ bool equalCtx(const BLOWFISH_CTX& a, const BLOWFISH_CTX& b) if (a.S[i][j] != b.S[i][j]) { printf("Failed for S at %ld, %ld: 0x%x != 0x%x\n", i, j, a.S[i][j], b.S[i][j]); - dumpCheckCtx("a", "b", a, b); return false; } return true;