From 9b307be647ff786f05c03fa742b982d99dd341ae Mon Sep 17 00:00:00 2001 From: Vernon Mauery Date: Wed, 22 Nov 2017 09:28:16 -0800 Subject: Prepare for adding RMCP+ cipher suite 17 In many places, there are baked-in assumptions about algorithms that tie the session initiation to cipher suite 3. This commit teases out those assumptions and prepares for the next patch that actually adds in the new authentication and integrity algorithms to support cipher suite 17. Change-Id: I2ee3672a7c503b89c5ff0aba30cf7a4601e24d04 Signed-off-by: Vernon Mauery --- crypt_algo.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'crypt_algo.cpp') diff --git a/crypt_algo.cpp b/crypt_algo.cpp index f33bca4..a10fd56 100644 --- a/crypt_algo.cpp +++ b/crypt_algo.cpp @@ -12,23 +12,6 @@ namespace cipher namespace crypt { -Interface::Interface(const std::vector& sik, const key& addKey) -{ - unsigned int mdLen = 0; - - // Generated K2 for the confidentiality algorithm with the additional key - // keyed with SIK. - k2.resize(sik.size()); - if (HMAC(EVP_sha1(), sik.data(), sik.size(), addKey.data(), - addKey.size(), k2.data(), &mdLen) == NULL) - { - throw std::runtime_error("Generating K2 for confidentiality algorithm" - "failed"); - } -} - -constexpr key AlgoAES128::const2; - constexpr std::array AlgoAES128::confPadBytes; -- cgit v1.2.1