diff options
| author | Jack Lloyd <[email protected]> | 2016-11-19 05:10:14 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-11-19 05:10:14 -0500 |
| commit | 6fec14d11e0abf4bacef2b9f7e1bbe82ce4eed94 (patch) | |
| tree | fe0ee715363555bbdfd6c7e9371d50ebaea7b47c /src/tests | |
| parent | 7c522b481ac2adc441335812062cd1e06daa42af (diff) | |
| parent | 74cf1686b727d9b41781df66f3f74d63b9c5cfe2 (diff) | |
Merge GH #729 Add CECPQ1 (x25519+NewHope) TLS ciphersuites
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/test_newhope.cpp | 4 | ||||
| -rw-r--r-- | src/tests/unit_tls.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tests/test_newhope.cpp b/src/tests/test_newhope.cpp index 894896777..95641bcaa 100644 --- a/src/tests/test_newhope.cpp +++ b/src/tests/test_newhope.cpp @@ -104,7 +104,7 @@ class NEWHOPE_Tests : public Text_Based_Test Botan::SHA_3_256 sha3; - std::vector<uint8_t> send_a(NEWHOPE_SENDABYTES); + std::vector<uint8_t> send_a(Botan::NEWHOPE_SENDABYTES); Botan::newhope_poly a_sk; Botan::newhope_keygen(send_a.data(), &a_sk, drbg_a); @@ -114,7 +114,7 @@ class NEWHOPE_Tests : public Text_Based_Test result.test_eq("Hash Output A", h_send_a, h_output_a); std::vector<uint8_t> sharedkey_b(32); - std::vector<uint8_t> send_b(NEWHOPE_SENDBBYTES); + std::vector<uint8_t> send_b(Botan::NEWHOPE_SENDBBYTES); Botan::newhope_sharedb(sharedkey_b.data(), send_b.data(), send_a.data(), drbg_b); result.test_eq("Key B", sharedkey_b, shared_key); diff --git a/src/tests/unit_tls.cpp b/src/tests/unit_tls.cpp index 8df963d9e..7b0aa26b2 100644 --- a/src/tests/unit_tls.cpp +++ b/src/tests/unit_tls.cpp @@ -978,6 +978,10 @@ class TLS_Unit_Tests : public Test test_modern_versions(results, *client_ses, *server_ses, *creds, "ECDH", "AES-128/GCM", "AEAD", { { "signature_methods", "RSA" } }); +#if defined(BOTAN_HAS_CECPQ1) + test_modern_versions(results, *client_ses, *server_ses, *creds, "CECPQ1", "AES-256/GCM", "AEAD"); +#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-128/GCM", "AEAD", |