X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_omac.c;h=0cbd45d2dd02a7913ba2bf382889da048e6a7b23;hb=4c04300b7523a9e270a719dd66ac7136e899811d;hp=af6eb2a9e9e6e9cf2260754db5c7b147b2c912d8;hpb=636dd0c1f36872f0abcb4f8a465e837929ed19d1;p=openssl-gost%2Fengine.git diff --git a/gost_omac.c b/gost_omac.c index af6eb2a..0cbd45d 100644 --- a/gost_omac.c +++ b/gost_omac.c @@ -7,11 +7,26 @@ #include "e_gost_err.h" #include "gost_lcl.h" +#define min(a,b) (((a) < (b)) ? (a) : (b)) + typedef struct omac_ctx { - CMAC_CTX *cmac_ctx; - size_t dgst_size; - int cipher_nid; - int key_set; + CMAC_CTX *cmac_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 @@ -19,19 +34,19 @@ typedef struct omac_ctx { static int omac_init(EVP_MD_CTX *ctx, int cipher_nid) { OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); - memset(c, 0, sizeof(OMAC_CTX)); - c->cipher_nid = cipher_nid; - c->key_set = 0; - - switch(cipher_nid) { - case NID_magma_cbc: - c->dgst_size = 4; - break; - - case NID_grasshopper_cbc: - c->dgst_size = 8; - break; - } + memset(c, 0, sizeof(OMAC_CTX)); + c->cipher_nid = cipher_nid; + c->key_set = 0; + + switch (cipher_nid) { + case NID_magma_cbc: + c->dgst_size = 8; + break; + + case NID_grasshopper_cbc: + c->dgst_size = 16; + break; + } return 1; } @@ -49,27 +64,26 @@ static int grasshopper_imit_init(EVP_MD_CTX *ctx) static int omac_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count) { OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); - if (!c->key_set) - { + if (!c->key_set) { GOSTerr(GOST_F_OMAC_IMIT_UPDATE, GOST_R_MAC_KEY_NOT_SET); return 0; - } + } - return CMAC_Update(c->cmac_ctx, data, count); + return CMAC_Update(c->cmac_ctx, data, count); } 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]; - size_t mac_size = sizeof(mac); + unsigned char mac[MAX_GOST_OMAC_SIZE]; + size_t mac_size = sizeof(mac); if (!c->key_set) { GOSTerr(GOST_F_OMAC_IMIT_FINAL, GOST_R_MAC_KEY_NOT_SET); return 0; } - CMAC_Final(c->cmac_ctx, mac, &mac_size); + CMAC_Final(c->cmac_ctx, mac, &mac_size); memcpy(md, mac, c->dgst_size); return 1; @@ -78,22 +92,27 @@ int omac_imit_final(EVP_MD_CTX *ctx, unsigned char *md) 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); + const OMAC_CTX *c_from = EVP_MD_CTX_md_data(from); if (c_from && c_to) { - c_to->dgst_size = c_from->dgst_size; - c_to->cipher_nid = c_from->cipher_nid; - c_to->key_set = c_from->key_set; + c_to->dgst_size = c_from->dgst_size; + c_to->cipher_nid = c_from->cipher_nid; + c_to->key_set = c_from->key_set; + memcpy(c_to->key, c_from->key, 32); + } else { + return 0; + } + if (!c_from->cmac_ctx) { + if (c_to->cmac_ctx) { + CMAC_CTX_free(c_to->cmac_ctx); + c_to->cmac_ctx = NULL; + } + return 1; } - else - { - return 0; - } - if (c_to->cmac_ctx == c_from->cmac_ctx) - { - c_to->cmac_ctx = CMAC_CTX_new(); - } - return CMAC_CTX_copy(c_to->cmac_ctx, c_from->cmac_ctx); + if (c_to->cmac_ctx == c_from->cmac_ctx) { + c_to->cmac_ctx = CMAC_CTX_new(); + } + return CMAC_CTX_copy(c_to->cmac_ctx, c_from->cmac_ctx); } /* Clean up imit ctx */ @@ -101,32 +120,30 @@ int omac_imit_cleanup(EVP_MD_CTX *ctx) { OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); - if (c) - { - CMAC_CTX_free(c->cmac_ctx); - memset(EVP_MD_CTX_md_data(ctx), 0, sizeof(OMAC_CTX)); - } + if (c) { + CMAC_CTX_free(c->cmac_ctx); + memset(EVP_MD_CTX_md_data(ctx), 0, sizeof(OMAC_CTX)); + } return 1; } -static int omac_key(OMAC_CTX *c, const EVP_CIPHER *cipher, const unsigned char *key, size_t key_size) +static int omac_key(OMAC_CTX * c, const EVP_CIPHER *cipher, + const unsigned char *key, size_t key_size) { - int ret = 0; - - c->cmac_ctx = CMAC_CTX_new(); - if (c->cmac_ctx == NULL) - { - GOSTerr(GOST_F_OMAC_KEY, ERR_R_MALLOC_FAILURE); - return 0; - } - - ret = CMAC_Init(c->cmac_ctx, key, key_size, cipher, NULL); - if (ret > 0) - { - c->key_set = 1; - } - return 1; -} + int ret = 0; + + c->cmac_ctx = CMAC_CTX_new(); + if (c->cmac_ctx == NULL) { + GOSTerr(GOST_F_OMAC_KEY, ERR_R_MALLOC_FAILURE); + return 0; + } + + ret = CMAC_Init(c->cmac_ctx, key, key_size, cipher, NULL); + if (ret > 0) { + c->key_set = 1; + } + return 1; +} int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) { @@ -135,78 +152,94 @@ int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr) *((unsigned int *)(ptr)) = 32; return 1; case EVP_MD_CTRL_SET_KEY: - { - OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); - const EVP_MD *md = EVP_MD_CTX_md(ctx); - const EVP_CIPHER *cipher = NULL; - - if (c->cipher_nid == NID_undef) - { - switch (EVP_MD_nid(md)) - { - case NID_magma_mac: - c->cipher_nid = NID_magma_cbc; - break; - - case NID_grasshopper_mac: - c->cipher_nid = NID_grasshopper_cbc; - break; - } - } - cipher = EVP_get_cipherbynid(c->cipher_nid); - - if (cipher == NULL) - { - GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_CIPHER_NOT_FOUND); - } - - if (EVP_MD_meth_get_init(EVP_MD_CTX_md(ctx)) (ctx) <= 0) { - GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET); - return 0; - } - EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NO_INIT); - - if (c->key_set) - { - GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_BAD_ORDER); - return 0; - } - - if (arg == 0) { - struct gost_mac_key *key = (struct gost_mac_key *)ptr; - return omac_key(c, cipher, key->key, 32); - - } else if (arg == 32) { - return omac_key(c, cipher, ptr, 32); - } - GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE); - return 0; - } - case EVP_MD_CTRL_MAC_LEN: { - OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); - switch (c->cipher_nid) - { - case NID_magma_cbc: - if (arg < 1 || arg > 8) { - GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE); + OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); + const EVP_MD *md = EVP_MD_CTX_md(ctx); + const EVP_CIPHER *cipher = NULL; + int ret = 0; + + if (c->cipher_nid == NID_undef) { + switch (EVP_MD_nid(md)) { + case NID_magma_mac: + c->cipher_nid = NID_magma_cbc; + break; + + case NID_grasshopper_mac: + c->cipher_nid = NID_grasshopper_cbc; + break; + } + } + cipher = EVP_get_cipherbynid(c->cipher_nid); + + if (cipher == NULL) { + GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_CIPHER_NOT_FOUND); + } + + if (EVP_MD_meth_get_init(EVP_MD_CTX_md(ctx)) (ctx) <= 0) { + GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET); return 0; } - c->dgst_size = arg; - break; - case NID_grasshopper_cbc: - if (arg < 1 || arg > 16) { - GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE); + EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NO_INIT); + + if (c->key_set) { + GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_BAD_ORDER); return 0; } - c->dgst_size = arg; - break; - default: - return 0; - } - return 1; - } + if (arg == 0) { + struct gost_mac_key *key = (struct gost_mac_key *)ptr; + ret = omac_key(c, cipher, key->key, 32); + if (ret > 0) + memcpy(c->key, key->key, 32); + return ret; + } else if (arg == 32) { + ret = omac_key(c, cipher, ptr, 32); + if (ret > 0) + memcpy(c->key, ptr, 32); + return ret; + } + GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE); + return 0; + } + case EVP_MD_CTRL_MAC_LEN: + { + OMAC_CTX *c = EVP_MD_CTX_md_data(ctx); + switch (c->cipher_nid) { + case NID_magma_cbc: + if (arg < 1 || arg > 8) { + GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE); + return 0; + } + c->dgst_size = arg; + break; + case NID_grasshopper_cbc: + if (arg < 1 || arg > 16) { + GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE); + return 0; + } + c->dgst_size = arg; + break; + default: + return 0; + } + return 1; + } +#ifdef EVP_MD_CTRL_TLSTREE + 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, + (const unsigned char *)ptr) ? + omac_key(c, EVP_get_cipherbynid(c->cipher_nid), + diversed_key, 32) : 0; + } + GOSTerr(GOST_F_OMAC_IMIT_CTRL, GOST_R_BAD_ORDER); + return 0; + } + return 0; +#endif default: return 0; } @@ -220,7 +253,7 @@ EVP_MD *magma_omac(void) 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_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) @@ -233,7 +266,7 @@ EVP_MD *magma_omac(void) EVP_MD_meth_free(md); md = NULL; } - _hidden_magma_mac_md = md; + _hidden_magma_mac_md = md; } return _hidden_magma_mac_md; } @@ -252,7 +285,7 @@ EVP_MD *grasshopper_omac(void) 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_result_size(md, 16) || !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) @@ -265,7 +298,7 @@ EVP_MD *grasshopper_omac(void) EVP_MD_meth_free(md); md = NULL; } - _hidden_grasshopper_mac_md = md; + _hidden_grasshopper_mac_md = md; } return _hidden_grasshopper_mac_md; } @@ -275,4 +308,3 @@ void grasshopper_omac_destroy(void) EVP_MD_meth_free(_hidden_grasshopper_mac_md); _hidden_grasshopper_mac_md = NULL; } -