Make grasshopper OMAC result size 8 instead of 4

[openssl-gost/engine.git] / gost_omac.c

diff --git a/gost_omac.c b/gost_omac.c
index ad96662f04fdc03a540a9a96bc68e90d17d0ab08..c4e81113d348039f687ec6829ff7a7c3e84bfad1 100644 (file)
--- a/gost_omac.c
+++ b/gost_omac.c
@@ -89,6 +89,10 @@ int omac_imit_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
                {
                        return 0;
                }
+               if (c_to->cmac_ctx == c_from->cmac_ctx)
+               {
+                       return 1;
+               }
                return CMAC_CTX_copy(c_to->cmac_ctx, c_from->cmac_ctx);
 }
 
@@ -133,7 +137,23 @@ int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
     case EVP_MD_CTRL_SET_KEY:
                                {
                                        OMAC_CTX *c = EVP_MD_CTX_md_data(ctx);
-                                       const EVP_CIPHER *cipher = EVP_get_cipherbynid(c->cipher_nid);
+                                       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)
                                        {
@@ -232,7 +252,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, 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)