Cleanup handling of TLS AEAD nonce sizes, push all knowledge of what

the nonce sizes should be down to the ciphersuite generating script.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/lib/tls/tls_ciphersuite.cpp b/src/lib/tls/tls_ciphersuite.cpp
index 4c9b204a6..e6a69126c 100644
--- a/src/lib/tls/tls_ciphersuite.cpp
+++ b/src/lib/tls/tls_ciphersuite.cpp
@@ -66,18 +66,20 @@ Ciphersuite::Ciphersuite(u16bit ciphersuite_code,
                          const char* kex_algo,
                          const char* cipher_algo,
                          size_t cipher_keylen,
-                         size_t cipher_ivlen,
+                         size_t exp_nonce_bytes,
+                         size_t imp_nonce_bytes,
                          const char* mac_algo,
                          size_t mac_keylen,
                          const char* prf_algo) :
    m_ciphersuite_code(ciphersuite_code),
    m_sig_algo(sig_algo),
    m_kex_algo(kex_algo),
-   m_cipher_algo(cipher_algo),
-   m_mac_algo(mac_algo),
    m_prf_algo(prf_algo),
+   m_cipher_algo(cipher_algo),
    m_cipher_keylen(cipher_keylen),
-   m_cipher_ivlen(cipher_ivlen),
+   m_explicit_nonce_bytes(exp_nonce_bytes),
+   m_implicit_nonce_bytes(imp_nonce_bytes),
+   m_mac_algo(mac_algo),
    m_mac_keylen(mac_keylen)
    {
    }