Backport TLS padding extension from master.

[oweals/openssl.git] / engines / ccgost / gosthash.c

diff --git a/engines/ccgost/gosthash.c b/engines/ccgost/gosthash.c
index 6365c699982a4eac5dcf9c4f2cdfaf561190ed05..8c278aa6452e1e80555f79d442eff45d1e7be22c 100644 (file)
--- a/engines/ccgost/gosthash.c
+++ b/engines/ccgost/gosthash.c
@@ -42,7 +42,7 @@ static void circle_xor8 (const byte *w, byte *k)
        byte buf[8];
        int i;
        memcpy(buf,w,8);
-       memcpy(k,w+8,24);
+       memmove(k,w+8,24);
        for(i=0;i<8;i++) 
                k[i+24]=buf[i]^k[i];
        }
@@ -86,7 +86,7 @@ static void xor_blocks (byte *result,const byte *a,const byte *b,size_t len)
  */
 static int hash_step(gost_ctx *c,byte *H,const byte *M) 
        {
-       static byte U[32],W[32],V[32],S[32],Key[32];
+       byte U[32],W[32],V[32],S[32],Key[32];
        int i;
        /* Compute first key */
        xor_blocks(W,H,M,32);
@@ -253,4 +253,3 @@ int finish_hash(gost_hash_ctx *ctx,byte *hashval)
        memcpy(hashval,H,32);
        return 1;
        }
-