X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_md2012.c;h=098208d82d5d62d7f94eecbc517721515b42cda8;hb=refs%2Fheads%2Fopenssl_1_0_2;hp=d909b4f9fabe8a0a17769b11f1bca501dece7ac6;hpb=cba16944bff9d8c5dcf37be641822cd3de6d2ec1;p=openssl-gost%2Fengine.git

diff --git a/gost_md2012.c b/gost_md2012.c
index d909b4f..098208d 100644
--- a/gost_md2012.c
+++ b/gost_md2012.c
@@ -19,6 +19,13 @@ 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 +42,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 +60,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 +90,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 +102,38 @@ 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;
+    }
+}