From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 21 May 2007 12:16:36 +0000 (+0000)
Subject: Fix warning and back out bad modification.
X-Git-Tag: OpenSSL_0_9_8k^2~819
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=9aba74e55a320eb717617949c5604524e2cd99b9;ds=sidebyside

Fix warning and back out bad modification.
---

diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c
index e02ad20326..9f1bf9adbe 100644
--- 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 76c5d9e5ff..03e0244027 100644
--- 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;