From 124d9ffe04845563cae1a5647fc7ebf5d9e00dce Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Thu, 1 Feb 2018 09:48:08 -0800 Subject: [PATCH] Disable mars448 test cases if the used crypto++ library version doesn't support it --- test/cryfs/config/CryCipherTest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/cryfs/config/CryCipherTest.cpp b/test/cryfs/config/CryCipherTest.cpp index 3a238fa6..fa3efbc1 100644 --- a/test/cryfs/config/CryCipherTest.cpp +++ b/test/cryfs/config/CryCipherTest.cpp @@ -81,7 +81,10 @@ TEST_F(CryCipherTest, FindsCorrectCipher) { "twofish-256-gcm", "twofish-256-cfb", "twofish-256-gcm", "twofish-256-cfb", "serpent-256-gcm", "serpent-256-cfb", "serpent-256-gcm", "serpent-256-cfb", "cast-256-gcm", "cast-256-cfb", - "mars-448-gcm", "mars-448-cfb", "mars-256-gcm", "mars-256-cfb", "mars-256-gcm", "mars-256-cfb" +#if CRYPTOPP_VERSION != 564 + "mars-448-gcm", "mars-448-cfb", +#endif + "mars-256-gcm", "mars-256-cfb", "mars-256-gcm", "mars-256-cfb" }); }