diff options
| author | Jack Lloyd <[email protected]> | 2016-12-28 10:54:08 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-12-28 10:54:08 -0500 |
| commit | 6ce3017161f76ae75a9a60430b4f63883c0f3f72 (patch) | |
| tree | bb44254fe465798496fc97d63b0ae7ad4ae63de5 /src/tests | |
| parent | 317a84c2f43af97043313fcf7584af087f8ac2d2 (diff) | |
Fix Camellia TLS tests
Disabling SHA-256 in TLS 1.1/1.2 has the effect of disabling the Camellia
ECDH ciphersuites. So the test policy ended up with an empty ciphersuite
list, when negotiating older versions.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/unit_tls.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/tests/unit_tls.cpp b/src/tests/unit_tls.cpp index 776326596..ba3f7bfd3 100644 --- a/src/tests/unit_tls.cpp +++ b/src/tests/unit_tls.cpp @@ -1080,8 +1080,8 @@ class TLS_Unit_Tests : public Test test_all_versions(results, *client_ses, *server_ses, *creds, "ECDH", "AES-256", "SHA-1", etm_setting); #if defined(BOTAN_HAS_CAMELLIA) - test_all_versions(results, *client_ses, *server_ses, *creds, "RSA", "Camellia-128", "SHA-256", etm_setting); - test_all_versions(results, *client_ses, *server_ses, *creds, "ECDH", "Camellia-256", "SHA-256 SHA-384", etm_setting); + test_all_versions(results, *client_ses, *server_ses, *creds, "RSA", "Camellia-128", "SHA-256 SHA-1", etm_setting); + test_all_versions(results, *client_ses, *server_ses, *creds, "RSA", "Camellia-256", "SHA-256 SHA-384 SHA-1", etm_setting); #endif #if defined(BOTAN_HAS_DES) @@ -1119,6 +1119,13 @@ class TLS_Unit_Tests : public Test client_ses->remove_all(); +#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, "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) test_modern_versions(results, *client_ses, *server_ses, *creds, "CECPQ1", "AES-256/GCM", "AEAD"); test_modern_versions(results, *client_ses, *server_ses, *creds, "CECPQ1", "ChaCha20Poly1305", "AEAD", |