diff options
| author | Jack Lloyd <[email protected]> | 2016-10-13 14:43:17 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-10-13 14:43:17 -0400 |
| commit | 79ea2dc44c2b0957b3cb262b46ed976d4ccc95a5 (patch) | |
| tree | 8a79933f20c5056ac3899b58da1149d84185ef2e /src/tests | |
| parent | 9f7b4486e1015886638168f49673398bee7a71bf (diff) | |
| parent | 4d1f71b1aa66ec915dd7ce7eab462f1a1faa17b2 (diff) | |
Merge GH #659 TLS CBC is optional
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/unit_tls.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tests/unit_tls.cpp b/src/tests/unit_tls.cpp index 28abe2d42..d52f17784 100644 --- a/src/tests/unit_tls.cpp +++ b/src/tests/unit_tls.cpp @@ -880,6 +880,7 @@ class TLS_Unit_Tests : public Test std::unique_ptr<Botan::Credentials_Manager> creds(create_creds(rng)); std::vector<Test::Result> results; +#if defined(BOTAN_HAS_TLS_CBC) for(std::string etm_setting : { "true", "false" }) { test_all_versions(results, *creds, "RSA", "AES-128", "SHA-256 SHA-1", etm_setting); @@ -904,6 +905,8 @@ class TLS_Unit_Tests : public Test } test_modern_versions(results, *creds, "DH", "AES-128", "SHA-256"); +#endif + test_modern_versions(results, *creds, "RSA", "AES-128/GCM"); test_modern_versions(results, *creds, "ECDH", "AES-128/GCM"); test_modern_versions(results, *creds, "ECDH", "AES-128/GCM", "AEAD", @@ -927,9 +930,11 @@ class TLS_Unit_Tests : public Test test_modern_versions(results, *creds, "PSK", "AES-128/CCM(8)"); #endif +#if defined(BOTAN_HAS_TLS_CBC) // For whatever reason no (EC)DHE_PSK GCM ciphersuites are defined test_modern_versions(results, *creds, "ECDHE_PSK", "AES-128", "SHA-256"); test_modern_versions(results, *creds, "DHE_PSK", "AES-128", "SHA-1"); +#endif return results; } |