Commit b320fa34e4 for openssl.org
commit b320fa34e4b20622dddc2e80c5e982dc0c49c4fc
Author: sftcd <stephen.farrell@cs.tcd.ie>
Date: Tue Feb 17 19:11:50 2026 +0000
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 ea2a854a89..edd90e0de6 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,