From: sftcd <stephen.farrell@cs.tcd.ie>
Date: Tue, 17 Feb 2026 19:11:50 +0000 (+0000)
Subject: ECH: avoid pointer aliasing in tls_construct_ctos_psk()
X-Git-Tag: openssl-4.0.0-alpha1~235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b320fa34e4b20622dddc2e80c5e982dc0c49c4fc;p=thirdparty%2Fopenssl.git

ECH: avoid pointer aliasing in tls_construct_ctos_psk()

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
MergeDate: Thu Feb 19 09:20:46 2026
(Merged from https://github.com/openssl/openssl/pull/30051)
---

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index ea2a854a890..edd90e0de6b 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -1455,7 +1455,7 @@ dopsksess:
         }
         /* set agems from random buffer */
         rndbufp = rndbuf;
-        agems = *((uint32_t *)(rndbufp));
+        memcpy(&agems, rndbufp, sizeof(agems));
         rndbufp += sizeof(agems);
         if (dores != 0) {
             if (!WPACKET_sub_memcpy_u16(pkt, rndbufp,