test_digest: Do HMAC using EVP_MAC API

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

diff --git a/gost_ameth.c b/gost_ameth.c
index 92319e74c55ae3a85edde2484e30e0647d472e0e..478b52f89f5066e27c3b0097ee31e661b6fbc38e 100644 (file)
--- a/gost_ameth.c
+++ b/gost_ameth.c
@@ -340,6 +340,8 @@ static int gost_cms_set_ktri_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *
                        gctx->cipher_nid = NID_magma_ctr;
                        break;
 
+               case NID_id_GostR3410_2001:
+               case NID_id_GostR3410_2001DH:
                case NID_id_GostR3410_2012_256:
                case NID_id_GostR3410_2012_512:
                        gctx->cipher_nid = NID_id_Gost28147_89;
@@ -445,10 +447,12 @@ static int pkey_ctrl_gost(EVP_PKEY *pkey, int op, long arg1, void *arg2)
         *(int *)arg2 = CMS_RECIPINFO_TRANS;
         return 1;
        case ASN1_PKEY_CTRL_CMS_IS_RI_TYPE_SUPPORTED:
-                       if (arg1 == CMS_RECIPINFO_AGREE || arg1 == CMS_RECIPINFO_TRANS)
-                               return 1;
+                       if (arg1 == CMS_RECIPINFO_AGREE || arg1 == CMS_RECIPINFO_TRANS) {
+          *(int *)arg2 = 1;
+                                 return 1;
+      }
                        else
-                               return 0;
+                                 return 0;
                        break;
 #endif
 #endif