diff options
author | Jack Lloyd <[email protected]> | 2016-12-28 13:07:50 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2016-12-28 13:07:50 -0500 |
commit | c26c554dde9d9a4f88f91764dc5dfa1416e152ff (patch) | |
tree | 725d504f03f762a6cd11bfd1a99450c476a88b14 | |
parent | 9b37778139d37dbdf35c463a127ff581c78d7b98 (diff) |
One more Camellia TLS test fix
-rw-r--r-- | src/tests/unit_tls.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/tests/unit_tls.cpp b/src/tests/unit_tls.cpp index ba3f7bfd3..928b31aac 100644 --- a/src/tests/unit_tls.cpp +++ b/src/tests/unit_tls.cpp @@ -1121,17 +1121,24 @@ class TLS_Unit_Tests : public Test #if defined(BOTAN_HAS_CAMELLIA) test_modern_versions(results, *client_ses, *server_ses, *creds, "RSA", "Camellia-128", "SHA-256"); - test_modern_versions(results, *client_ses, *server_ses, *creds, "RSA", "Camellia-256", "SHA-384"); + test_modern_versions(results, *client_ses, *server_ses, *creds, "RSA", "Camellia-256", "SHA-384 SHA-256"); test_modern_versions(results, *client_ses, *server_ses, *creds, "ECDH", "Camellia-128/GCM", "AEAD"); test_modern_versions(results, *client_ses, *server_ses, *creds, "ECDH", "Camellia-256/GCM", "AEAD"); #endif #if defined(BOTAN_HAS_CECPQ1) + +#if defined(BOTAN_HAS_AES) && defined(BOTAN_HAS_AEAD_GCM) test_modern_versions(results, *client_ses, *server_ses, *creds, "CECPQ1", "AES-256/GCM", "AEAD"); +#endif + +#if defined(BOTAN_HAS_AEAD_CHACHA20_POLY1305) test_modern_versions(results, *client_ses, *server_ses, *creds, "CECPQ1", "ChaCha20Poly1305", "AEAD", { { "signature_methods", "RSA" }}); #endif +#endif + test_modern_versions(results, *client_ses, *server_ses, *creds, "ECDH", "AES-128/GCM", "AEAD", { { "use_ecc_point_compression", "true" } }); test_modern_versions(results, *client_ses, *server_ses, *creds, "ECDH", "AES-256/GCM", "AEAD", |