From 6352e9a98925d375d0c2d3d8b0de66966d9522fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 29 Jan 2020 13:19:27 +0100 Subject: Backport 7d2ef3d2e540885dec26d91dad061bff1621ad07 into 7.4 As the data structures are public, the fix for 64-bit consists on replacing the blanket memcpy with individual assignments. --- ext/hash/hash_gost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/hash/hash_gost.c b/ext/hash/hash_gost.c index f51b310b70..ded6d1c6a7 100644 --- a/ext/hash/hash_gost.c +++ b/ext/hash/hash_gost.c @@ -291,7 +291,8 @@ PHP_HASH_API void PHP_GOSTFinal(unsigned char digest[32], PHP_GOST_CTX *context) GostTransform(context, context->buffer); } - memcpy(l, context->count, sizeof(context->count)); + l[0] = context->count[0]; + l[1] = context->count[1]; Gost(context, l); memcpy(l, &context->state[8], sizeof(l)); Gost(context, l); -- cgit v1.2.1