Commit 869506ded6 for openssl.org
commit 869506ded60d3408c89e1950b37feb72a6970f28
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date: Mon Feb 23 06:04:31 2026 +0100
ssl/statem/extensions_clnt.c: superfluous NULL check in tls_construct_ctos_psk()
Remove superfluous NULL check of s->session in tls_construct_ctos_psk(),
as it is assumed to be non-NULL elsewhere.
Resolves: https://scan5.scan.coverity.com/#/project-view/65248/10222?selectedIssue=1681450
Fixes: ade10c5dbf20 "ECH client side"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
MergeDate: Wed Feb 25 11:10:54 2026
(Merged from https://github.com/openssl/openssl/pull/30139)
diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index edd90e0de6..2c1f9270df 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -1433,10 +1433,6 @@ dopsksess:
unsigned char *rndbuf = NULL, *rndbufp = NULL;
size_t totalrndsize = 0;
- if (s->session == NULL) {
- SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
- return EXT_RETURN_FAIL;
- }
totalrndsize = s->session->ext.ticklen
+ sizeof(agems)
+ s->psksession_id_len