Merge branch 'master' into gost89-cbc

diff --git a/gost_md2012.c b/gost_md2012.c
index 092de2653a86a1064d0f6670d02cecf251c84269..e20e6602b4aada6665a4703a47554b6279500a76 100644 (file)
--- a/gost_md2012.c
+++ b/gost_md2012.c
@@ -19,6 +19,11 @@ static int gost_digest_update(EVP_MD_CTX *ctx, const void *data,
 static int gost_digest_final(EVP_MD_CTX *ctx, unsigned char *md);
 static int gost_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from);
 static int gost_digest_cleanup(EVP_MD_CTX *ctx);
+static int gost_digest_ctrl_256(EVP_MD_CTX *ctx, int type, int arg, void *ptr);
+static int gost_digest_ctrl_512(EVP_MD_CTX *ctx, int type, int arg, void *ptr);
+
+const char micalg_256[] = "gostr3411-2012-256";
+const char micalg_512[] = "gostr3411-2012-512";
 
 EVP_MD digest_gost2012_512 = {
     NID_id_GostR3411_2012_512,
@@ -35,7 +40,7 @@ EVP_MD digest_gost2012_512 = {
     {NID_undef, NID_undef, 0, 0, 0},
     64,                         /* block size */
     sizeof(gost2012_hash_ctx),
-    NULL
+    gost_digest_ctrl_512,
 };
 
 EVP_MD digest_gost2012_256 = {
@@ -53,7 +58,7 @@ EVP_MD digest_gost2012_256 = {
     {NID_undef, NID_undef, 0, 0, 0},
     64,                         /* block size */
     sizeof(gost2012_hash_ctx),
-    NULL
+    gost_digest_ctrl_256
 };
 
 static int gost_digest_init512(EVP_MD_CTX *ctx)
@@ -83,7 +88,7 @@ static int gost_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
 static int gost_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
 {
     if (to->md_data && from->md_data)
-        memcpy(to->md_data, from->md_data, sizeof(*(from->md_data)));
+        memcpy(to->md_data, from->md_data, sizeof(gost2012_hash_ctx));
 
     return 1;
 }
@@ -95,3 +100,43 @@ static int gost_digest_cleanup(EVP_MD_CTX *ctx)
 
     return 1;
 }
+
+static int gost_digest_ctrl_256(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
+  {
+  switch (type)
+    {
+    case EVP_MD_CTRL_MICALG:
+      {
+        *((char **)ptr) = OPENSSL_malloc(strlen(micalg_256)+1);
+        if (*((char **)ptr) != NULL)
+        {
+          strcpy(*((char **)ptr), micalg_256);
+          return 1;
+        }
+        return 0;
+      }
+    default:
+      return 0;
+    }
+  }
+
+static int gost_digest_ctrl_512(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
+  {
+  switch (type)
+    {
+    case EVP_MD_CTRL_MICALG:
+      {
+        *((char **)ptr) = OPENSSL_malloc(strlen(micalg_512)+1);
+        if (*((char **)ptr) != NULL)
+        {
+          strcpy(*((char **)ptr), micalg_512);
+          return 1;
+        }
+        return 0;
+      }
+      return 1;
+    default:
+      return 0;
+    }
+  }
+