From 3d85c7f408e54e1a0b367901534139ba5f1cad07 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 4 Sep 2017 08:44:02 +0100 Subject: [PATCH] Don't attempt to add a zero length padding extension The padding extension should always be at least 1 byte long Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/4331) --- ssl/statem/extensions_clnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c index 2c72dea248..bffe7aca08 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c @@ -843,7 +843,7 @@ EXT_RETURN tls_construct_ctos_padding(SSL *s, WPACKET *pkt, * 1 byte long so as not to have an empty extension last (WebSphere 7.x, * 8.x are intolerant of that condition) */ - if (hlen >= 4) + if (hlen > 4) hlen -= 4; else hlen = 1; -- 2.34.1