From: Tomas Mraz Date: Thu, 21 Apr 2022 15:33:26 +0000 (+0200) Subject: poly1305: Properly copy the whole context on dup X-Git-Tag: openssl-3.2.0-alpha1~2732 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbe909d00e9a593bd5954dfca4d3020467977565;p=thirdparty%2Fopenssl.git poly1305: Properly copy the whole context on dup Also reset the updated flag when Poly1305_Init is called. Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/18143) --- diff --git a/providers/implementations/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c index ad67216d2a4..28789d25c81 100644 --- a/providers/implementations/macs/poly1305_prov.c +++ b/providers/implementations/macs/poly1305_prov.c @@ -65,11 +65,11 @@ static void *poly1305_dup(void *vsrc) if (!ossl_prov_is_running()) return NULL; - dst = poly1305_new(src->provctx); + dst = OPENSSL_malloc(sizeof(*dst)); if (dst == NULL) return NULL; - dst->poly1305 = src->poly1305; + *dst = *src; return dst; } @@ -86,6 +86,7 @@ static int poly1305_setkey(struct poly1305_data_st *ctx, return 0; } Poly1305_Init(&ctx->poly1305, key); + ctx->updated = 0; return 1; }