Explicitely setting cofactor

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

diff --git a/gost_pmeth.c b/gost_pmeth.c
index e615d012936c29bd4ec75319ae9a2a7473af9ff1..69080bdc52f689907ea240c1003e9ead0b1538b1 100644 (file)
--- a/gost_pmeth.c
+++ b/gost_pmeth.c
@@ -556,8 +556,7 @@ static int pkey_gost_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
     case EVP_PKEY_CTRL_MD:
         {
             int nid = EVP_MD_type((const EVP_MD *)p2);
-            if (nid != NID_id_Gost28147_89_MAC && nid != NID_gost_mac_12
-                && nid != NID_magma_mac && nid != NID_grasshopper_mac) {
+            if (nid != NID_id_Gost28147_89_MAC && nid != NID_gost_mac_12) {
                 GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL,
                         GOST_R_INVALID_DIGEST_TYPE);
                 return 0;
@@ -615,7 +614,6 @@ static int pkey_gost_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         }
     case EVP_PKEY_CTRL_MAC_LEN:
         {
-                               /*TODO*/
             if (p1 < 1 || p1 > 8) {
 
                 GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL, GOST_R_INVALID_MAC_SIZE);
@@ -747,8 +745,7 @@ static int pkey_gost_omac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2, si
         }
     case EVP_PKEY_CTRL_MAC_LEN:
         {
-                               /*TODO*/
-            if (p1 < 1 || p1 > 8) {
+            if (p1 < 1 || p1 > max_size) {
 
                 GOSTerr(GOST_F_PKEY_GOST_OMAC_CTRL, GOST_R_INVALID_MAC_SIZE);
                 return 0;