diff options
| author | Jack Lloyd <[email protected]> | 2018-01-27 09:41:56 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-01-27 09:42:23 -0500 |
| commit | cfe57137e5957b84b6b749db8d9f02c3ee1f8c1e (patch) | |
| tree | 86ea1e7bcb9571cb384cfc1fbc511c6fb0411f8a | |
| parent | 8f17d65056903ca4da9bb16a85db717e4bea4456 (diff) | |
Fix speed test of cipher modes [ci skip]
Add BOTAN_HAS_CIPHER_MODES which is an easier to read/remember
macro than BOTAN_HAS_MODES
| -rw-r--r-- | src/cli/speed.cpp | 6 | ||||
| -rw-r--r-- | src/lib/modes/info.txt | 1 | ||||
| -rw-r--r-- | src/tests/test_modes.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/cli/speed.cpp b/src/cli/speed.cpp index b60e26ef1..73b4b6a06 100644 --- a/src/cli/speed.cpp +++ b/src/cli/speed.cpp @@ -35,7 +35,7 @@ #include <botan/hash.h> #endif -#if defined(BOTAN_HAS_CIPHER_MODE) +#if defined(BOTAN_HAS_CIPHER_MODES) #include <botan/cipher_mode.h> #endif @@ -742,7 +742,7 @@ class Speed final : public Command std::bind(&Speed::bench_stream_cipher, this, _1, _2, _3, _4)); } #endif -#if defined(BOTAN_HAS_CIPHER_MODE) +#if defined(BOTAN_HAS_CIPHER_MODES) else if(auto enc = Botan::get_cipher_mode(algo, Botan::ENCRYPTION)) { auto dec = Botan::get_cipher_mode(algo, Botan::DECRYPTION); @@ -1087,7 +1087,7 @@ class Speed final : public Command } #endif -#if defined(BOTAN_HAS_CIPHER_MODE) +#if defined(BOTAN_HAS_CIPHER_MODES) void bench_cipher_mode( Botan::Cipher_Mode& enc, Botan::Cipher_Mode& dec, diff --git a/src/lib/modes/info.txt b/src/lib/modes/info.txt index 70bd189d7..4c19db04c 100644 --- a/src/lib/modes/info.txt +++ b/src/lib/modes/info.txt @@ -1,5 +1,6 @@ <defines> MODES -> 20150626 +CIPHER_MODES -> 20180124 </defines> <header:public> diff --git a/src/tests/test_modes.cpp b/src/tests/test_modes.cpp index 3ac34760d..d707f4419 100644 --- a/src/tests/test_modes.cpp +++ b/src/tests/test_modes.cpp @@ -7,13 +7,13 @@ #include "tests.h" -#if defined(BOTAN_HAS_MODES) +#if defined(BOTAN_HAS_CIPHER_MODES) #include <botan/cipher_mode.h> #endif namespace Botan_Tests { -#if defined(BOTAN_HAS_MODES) +#if defined(BOTAN_HAS_CIPHER_MODES) class Cipher_Mode_Tests final : public Text_Based_Test { |