Fix warning and back out bad modification.

diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c
index e02ad20326de2d06d9026f5778af20487841e4d3..9f1bf9adbe9743014161f12b99aa4aa369e647d9 100644 (file)
--- a/engines/ccgost/gost_crypt.c
+++ b/engines/ccgost/gost_crypt.c
@@ -565,7 +565,7 @@ int gost_imit_init_cpa(EVP_MD_CTX *ctx)
 
 static void mac_block_mesh(struct ossl_gost_imit_ctx *c,const unsigned char *data)
        {
-       char buffer[8];
+       unsigned char buffer[8];
        /* We are using local buffer for iv because CryptoPro doesn't 
         * interpret internal state of MAC algorithm as iv during keymeshing
         * (but does initialize internal state from iv in key transport

diff --git a/engines/ccgost/gost_pmeth.c b/engines/ccgost/gost_pmeth.c
index 76c5d9e5ff2a8c9b639204bbcad8377d7f1f73c3..03e0244027a475172b194387459f0281b3827753 100644 (file)
--- a/engines/ccgost/gost_pmeth.c
+++ b/engines/ccgost/gost_pmeth.c
@@ -591,7 +591,7 @@ static int pkey_gost_mac_ctrl (EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                                } else {
                                key = &(data->key);
                                }
-                       return imit_gost_vizir.md_ctrl(mctx,EVP_MD_CTRL_SET_KEY,32,key);
+                       return mctx->digest->md_ctrl(mctx,EVP_MD_CTRL_SET_KEY,32,key);
                        }  
                }       
        return -2;