diff options
| author | Jack Lloyd <[email protected]> | 2018-04-05 11:21:16 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-04-05 11:21:16 -0400 |
| commit | 0fe2273728ca637ff0d57cd80274bf7c541d1dbd (patch) | |
| tree | b9033dfa756688980d68d08a7c271988a65843d5 /src | |
| parent | e137dcb349a4c2e7fda71ed539361bbdefedebd1 (diff) | |
Fix bug in CLI, and fix bug in CLI tests
The tests were detecting the problem and failing, but just returned
zero in any case so CI did not fail.
Also fix some CLI bugs that caused failures if OpenSSL was enabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cli/timing_tests.cpp | 6 | ||||
| -rwxr-xr-x | src/scripts/test_cli.py | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/cli/timing_tests.cpp b/src/cli/timing_tests.cpp index f3ecdc034..41f622bd5 100644 --- a/src/cli/timing_tests.cpp +++ b/src/cli/timing_tests.cpp @@ -32,7 +32,7 @@ #include <botan/numthry.h> #endif -#if defined(BOTAN_HAS_EC_GROUP) +#if defined(BOTAN_HAS_ECC_GROUP) #include <botan/ec_group.h> #endif @@ -303,7 +303,7 @@ ticks ECDSA_Timing_Test::measure_critical_function(std::vector<uint8_t> input) #endif -#if defined(BOTAN_HAS_EC_GROUP) +#if defined(BOTAN_HAS_ECC_GROUP) class ECC_Mul_Timing_Test final : public Timing_Test { @@ -545,7 +545,7 @@ std::unique_ptr<Timing_Test> Timing_Test_Command::lookup_timing_test(const std:: } #endif -#if defined(BOTAN_HAS_EC_GROUP) +#if defined(BOTAN_HAS_ECC_GROUP) if(test_type == "ecc_mul") { return std::unique_ptr<Timing_Test>(new ECC_Mul_Timing_Test("brainpool512r1")); diff --git a/src/scripts/test_cli.py b/src/scripts/test_cli.py index 329a51295..ea5808e7c 100755 --- a/src/scripts/test_cli.py +++ b/src/scripts/test_cli.py @@ -169,7 +169,7 @@ wGf/MGbgPebBLmozAANENw== valid_sig = "xd3J9jtTBWFWA9ceVGYpmEB0A1DmOoxHRF7FpYW2ng/GYEH/HYljIfYzu/L5iTK6XfVePxeMr6ubCYCD9vFGIw==" - test_cli("sign", "%s %s" % (priv_key, priv_key), valid_sig) + test_cli("sign", "--provider=base %s %s" % (priv_key, priv_key), valid_sig) test_cli("verify", [pub_key, priv_key, '-'], "Signature is valid", valid_sig) @@ -290,7 +290,7 @@ MCACAQUTBnN0cmluZzEGAQH/AgFjBAUAAAAAAAMEAP///w== def cli_speed_tests(): output = test_cli("speed", ["--msec=1", "--buf-size=64,512", "AES-128"], None).split('\n') - if len(output) != 4: + if len(output) % 4 != 0: logging.error("Unexpected number of lines for AES-128 speed test") # pylint: disable=line-too-long @@ -370,6 +370,8 @@ def main(args=None): print("Ran %d tests with %d failures in %.02f seconds" % ( TESTS_RUN, TESTS_FAILED, end_time - start_time)) + if TESTS_FAILED > 0: + return 1 return 0 if __name__ == '__main__': |