From: Matt Caswell <matt@openssl.org>
Date: Mon, 30 Oct 2023 16:53:30 +0000 (+0000)
Subject: Don't error if s_client receives exactly BUFSIZZ data
X-Git-Tag: openssl-3.3.0-alpha1~710
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74ff15e1a1987686812c465ee3200bc25efa0e8f;p=thirdparty%2Fopenssl.git

Don't error if s_client receives exactly BUFSIZZ data

We should accept that many bytes without failing

Fixes #22551

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/22558)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 8a7650223ca..78a44755cb5 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -3798,7 +3798,7 @@ static void user_data_init(struct user_data_st *user_data, SSL *con, char *buf,
 
 static int user_data_add(struct user_data_st *user_data, size_t i)
 {
-    if (user_data->buflen != 0 || i > user_data->bufmax - 1)
+    if (user_data->buflen != 0 || i > user_data->bufmax)
         return 0;
 
     user_data->buflen = i;