Merge pull request gost-engine#517 from Mironenko/keyexpimp3

Extract kexp15, kimp15, kdftree2012_256 and tlstree implementations into a separate module

Author: chipitsine

CMakeLists.txt

@@ -138,6 +138,12 @@ set(GOST_HASH_2012_SOURCE_FILES
         gosthash2012_sse2.h
         )
 
+set(GOST_TLS12_ADDITIONAL_SOURCE_FILES
+        gost_tls12_additional_kdftree.c
+        gost_tls12_additional_kexpimp.c
+        gost_tls12_additional_tlstree.c
+        )
+
 set(GOST_GRASSHOPPER_SOURCE_FILES
         gost_grasshopper.h
         gost_grasshopper_core.h
@@ -309,11 +315,14 @@ add_test(NAME context-with-provider COMMAND test_context)
 set_tests_properties(context-with-provider
   PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_PROVIDER}")
 
-# test_keyexpimp is an internals testing program, it doesn't need a test env
-add_executable(test_keyexpimp test_keyexpimp.c)
-#target_compile_definitions(test_keyexpimp PUBLIC -DOPENSSL_LOAD_CONF)
-target_link_libraries(test_keyexpimp gost_core gost_err)
-add_test(NAME keyexpimp COMMAND test_keyexpimp)
+add_executable(test_tls12additional test_tls12additional.c)
+target_link_libraries(test_tls12additional gost_err gosttls12additional OpenSSL::Crypto)
+add_test(NAME tls12additional-with-engine COMMAND test_tls12additional)
+set_tests_properties(tls12additional-with-engine
+  PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_ENGINE}")
+add_test(NAME tls12additional-with-provider COMMAND test_tls12additional)
+set_tests_properties(tls12additional-with-provider
+  PROPERTIES ENVIRONMENT "${TEST_ENVIRONMENT_PROVIDER}")
 
 # test_gost89 is an internals testing program, it doesn't need a test env
 add_executable(test_gost89 test_gost89.c)
@@ -377,7 +386,7 @@ set(BINARY_TESTS_TARGETS
         test_derive
         test_sign
         test_context
-        test_keyexpimp
+        test_tls12additional
         test_gost89
         test_tls
         test_gosthash
@@ -397,9 +406,13 @@ add_library(gosthash2012 STATIC ${GOST_HASH_2012_SOURCE_FILES})
 set_target_properties(gosthash2012 PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(gosthash2012 PRIVATE OpenSSL::Crypto)
 
+add_library(gosttls12additional STATIC ${GOST_TLS12_ADDITIONAL_SOURCE_FILES})
+set_target_properties(gosttls12additional PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_link_libraries(gosttls12additional PRIVATE OpenSSL::Crypto gost_err)
+
 add_library(gost_core STATIC ${GOST_LIB_SOURCE_FILES})
 set_target_properties(gost_core PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_link_libraries(gost_core PRIVATE OpenSSL::Crypto gost89 gosthash gosthash2012)
+target_link_libraries(gost_core PRIVATE OpenSSL::Crypto gost89 gosthash gosthash2012 gosttls12additional)
 
 add_library(gost_err STATIC ${GOST_ERR_SOURCE_FILES})
 set_target_properties(gost_err PROPERTIES POSITION_INDEPENDENT_CODE ON)

gost_crypt.c

@@ -15,6 +15,7 @@
 #include "e_gost_err.h"
 #include "gost_lcl.h"
 #include "gost_gost2015.h"
+#include "gost_tls12_additional.h"
 
 #if !defined(CCGOST_DEBUG) && !defined(DEBUG)
 # ifndef NDEBUG
@@ -1164,7 +1165,7 @@ static int gost_magma_mgm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
     case EVP_CTRL_TLSTREE:
         {
             unsigned char newkey[32];
-            if (gost_tlstree(OBJ_sn2nid(SN_magma_mgm),
+            if (gost_tlstree_magma_mgm(
                     (const unsigned char *)mctx->ks.g_ks.cctx.master_key,
                     newkey, (const unsigned char *)ptr, mctx->tlstree_mode)
                   > 0) {
@@ -1336,7 +1337,7 @@ static int magma_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
                 return -1;
             }
 
-            if (gost_tlstree(NID_magma_cbc, (const unsigned char *)c->master_key, newkey,
+            if (gost_tlstree_magma_cbc((const unsigned char *)c->master_key, newkey,
                              (const unsigned char *)seq, TLSTREE_MODE_NONE) > 0) {
                 memset(adjusted_iv, 0, 8);
                 memcpy(adjusted_iv, EVP_CIPHER_CTX_original_iv(ctx), 4);

gost_ec_keyx.c

@@ -22,6 +22,7 @@
 #include "e_gost_err.h"
 #include "gost_keywrap.h"
 #include "gost_lcl.h"
+#include "gost_tls12_additional.h"
 
 int internal_compute_ecdh(unsigned char *out, size_t *out_len,
                           const unsigned char *ukm, size_t ukm_size,

gost_gost2015.c

@@ -8,6 +8,7 @@
 #include "gost_gost2015.h"
 #include "gost_grasshopper_defines.h"
 #include "gost_grasshopper_math.h"
+#include "gost_tls12_additional.h"
 #include "e_gost_err.h"
 #include <string.h>
 #include <openssl/rand.h>

gost_grasshopper_cipher.c

@@ -16,6 +16,7 @@
 #include <string.h>
 
 #include "gost_lcl.h"
+#include "gost_tls12_additional.h"
 #include "e_gost_err.h"
 
 enum GRASSHOPPER_CIPHER_TYPE {
@@ -1105,7 +1106,7 @@ static int gost_grasshopper_mgm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void
     case EVP_CTRL_TLSTREE:
         {
             unsigned char newkey[32];
-            if (gost_tlstree(OBJ_sn2nid(SN_kuznyechik_mgm),
+            if (gost_tlstree_grasshopper_mgm(
                     mctx->ks.gh_ks.master_key.k.b, newkey,
                     (const unsigned char *)ptr, mctx->tlstree_mode)
                   > 0) {
@@ -1174,7 +1175,7 @@ static int gost_grasshopper_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, v
               return -1;
           }
 
-          if (gost_tlstree(NID_grasshopper_cbc, c->master_key.k.b, newkey,
+          if (gost_tlstree_grasshopper_cbc(c->master_key.k.b, newkey,
                 (const unsigned char *)seq, TLSTREE_MODE_NONE) > 0) {
             memset(adjusted_iv, 0, 16);
             memcpy(adjusted_iv, EVP_CIPHER_CTX_original_iv(ctx), 8);