X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_omac.c;h=c4026d4fdc758d6da9fa9654ca3b2b7d0833a200;hb=dd645e71d12ec790dc6c2e1c44163e2683ae4c6a;hp=2000152d4101a936657ace013441d4c167f082d8;hpb=31c6ffa026a9bf42c2e3fdaa66a80230b09306ec;p=openssl-gost%2Fengine.git diff --git a/gost_omac.c b/gost_omac.c index 2000152..c4026d4 100644 --- a/gost_omac.c +++ b/gost_omac.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2019 Dmitry Belyavskiy + * Copyright (c) 2020 Vitaly Chikunov + * + * Contents licensed under the terms of the OpenSSL license + * See https://www.openssl.org/source/license.html for details + */ #include #include #include @@ -14,7 +21,19 @@ typedef struct omac_ctx { size_t dgst_size; int cipher_nid; int key_set; +/* + * Here begins stuff related to TLSTREE processing + * We MUST store the original key to derive TLSTREE keys from it + * and TLS seq no. + * */ unsigned char key[32]; +/* + * TODO + * TLSTREE intermediate values should be recalculated only when + * C_i & (seq_no+1) != C_i & (seq_no) + * so somewhen we will store C_i & (seq_no) in this structure + * to avoid redundant hash calculations. + * */ } OMAC_CTX; #define MAX_GOST_OMAC_SIZE 16 @@ -28,11 +47,11 @@ static int omac_init(EVP_MD_CTX *ctx, int cipher_nid) switch (cipher_nid) { case NID_magma_cbc: - c->dgst_size = 4; + c->dgst_size = 8; break; case NID_grasshopper_cbc: - c->dgst_size = 8; + c->dgst_size = 16; break; } @@ -60,7 +79,7 @@ static int omac_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count) return CMAC_Update(c->cmac_ctx, data, count); } -int omac_imit_final(EVP_MD_CTX *ctx, unsigned char *md) +static int omac_imit_final(EVP_MD_CTX *ctx, unsigned char *md) { OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); unsigned char mac[MAX_GOST_OMAC_SIZE]; @@ -77,7 +96,7 @@ int omac_imit_final(EVP_MD_CTX *ctx, unsigned char *md) return 1; } -int omac_imit_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) +static int omac_imit_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) { OMAC_CTX *c_to = EVP_MD_CTX_md_data(to); const OMAC_CTX *c_from = EVP_MD_CTX_md_data(from); @@ -104,7 +123,7 @@ int omac_imit_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) } /* Clean up imit ctx */ -int omac_imit_cleanup(EVP_MD_CTX *ctx) +static int omac_imit_cleanup(EVP_MD_CTX *ctx) { OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); @@ -120,6 +139,7 @@ static int omac_key(OMAC_CTX * c, const EVP_CIPHER *cipher, { int ret = 0; + CMAC_CTX_free(c->cmac_ctx); c->cmac_ctx = CMAC_CTX_new(); if (c->cmac_ctx == NULL) { GOSTerr(GOST_F_OMAC_KEY, ERR_R_MALLOC_FAILURE); @@ -133,6 +153,7 @@ static int omac_key(OMAC_CTX * c, const EVP_CIPHER *cipher, return 1; } +/* Called directly by gost_kexp15() */ int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) { switch (type) { @@ -189,7 +210,7 @@ int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE); return 0; } - case EVP_MD_CTRL_MAC_LEN: + case EVP_MD_CTRL_XOF_LEN: /* Supported in OpenSSL */ { OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); switch (c->cipher_nid) { @@ -216,7 +237,6 @@ int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) case EVP_MD_CTRL_TLSTREE: { OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); - if (c->key_set) { unsigned char diversed_key[32]; return gost_tlstree(c->cipher_nid, c->key, diversed_key, @@ -234,66 +254,27 @@ int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) } } -static EVP_MD *_hidden_magma_mac_md = NULL; - -EVP_MD *magma_omac(void) -{ - if (_hidden_magma_mac_md == NULL) { - EVP_MD *md; - - if ((md = EVP_MD_meth_new(NID_magma_mac, NID_undef)) == NULL - || !EVP_MD_meth_set_result_size(md, 4) - || !EVP_MD_meth_set_input_blocksize(md, 8) - || !EVP_MD_meth_set_app_datasize(md, sizeof(OMAC_CTX)) - || !EVP_MD_meth_set_flags(md, 0) - || !EVP_MD_meth_set_init(md, magma_imit_init) - || !EVP_MD_meth_set_update(md, omac_imit_update) - || !EVP_MD_meth_set_final(md, omac_imit_final) - || !EVP_MD_meth_set_copy(md, omac_imit_copy) - || !EVP_MD_meth_set_cleanup(md, omac_imit_cleanup) - || !EVP_MD_meth_set_ctrl(md, omac_imit_ctrl)) { - EVP_MD_meth_free(md); - md = NULL; - } - _hidden_magma_mac_md = md; - } - return _hidden_magma_mac_md; -} - -void magma_omac_destroy(void) -{ - EVP_MD_meth_free(_hidden_magma_mac_md); - _hidden_magma_mac_md = NULL; -} - -static EVP_MD *_hidden_grasshopper_mac_md = NULL; - -EVP_MD *grasshopper_omac(void) -{ - if (_hidden_grasshopper_mac_md == NULL) { - EVP_MD *md; - - if ((md = EVP_MD_meth_new(NID_grasshopper_mac, NID_undef)) == NULL - || !EVP_MD_meth_set_result_size(md, 8) - || !EVP_MD_meth_set_input_blocksize(md, 8) - || !EVP_MD_meth_set_app_datasize(md, sizeof(OMAC_CTX)) - || !EVP_MD_meth_set_flags(md, 0) - || !EVP_MD_meth_set_init(md, grasshopper_imit_init) - || !EVP_MD_meth_set_update(md, omac_imit_update) - || !EVP_MD_meth_set_final(md, omac_imit_final) - || !EVP_MD_meth_set_copy(md, omac_imit_copy) - || !EVP_MD_meth_set_cleanup(md, omac_imit_cleanup) - || !EVP_MD_meth_set_ctrl(md, omac_imit_ctrl)) { - EVP_MD_meth_free(md); - md = NULL; - } - _hidden_grasshopper_mac_md = md; - } - return _hidden_grasshopper_mac_md; -} - -void grasshopper_omac_destroy(void) -{ - EVP_MD_meth_free(_hidden_grasshopper_mac_md); - _hidden_grasshopper_mac_md = NULL; -} +static GOST_digest omac_template_digest = { + .input_blocksize = 8, + .app_datasize = sizeof(OMAC_CTX), + .flags = EVP_MD_FLAG_XOF, + .update = omac_imit_update, + .final = omac_imit_final, + .copy = omac_imit_copy, + .cleanup = omac_imit_cleanup, + .ctrl = omac_imit_ctrl, +}; + +GOST_digest magma_mac_digest = { + .nid = NID_magma_mac, + .template = &omac_template_digest, + .result_size = 8, + .init = magma_imit_init, +}; + +GOST_digest grasshopper_mac_digest = { + .nid = NID_grasshopper_mac, + .template = &omac_template_digest, + .result_size = 16, + .init = grasshopper_imit_init, +};