commit a30439a7f94d8a3e4dc974bfc6e24817ee79f9a0
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Apr 06 23:34:36 2022 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Apr 13 11:24:38 2022 +0200
tree 842e5887ed5b73222beef7040a6728b214bb8ef5
parent 736d91dae68f781ea8b641daa9b7ce902d8e79ac

Fix off-by-one in buffer_size usage

The added null byte was accounted for twice, once by taking
opt.buffer_size+1 when allocating the buffer and once by taking opt.buffer-1
when filling the buffer. Make opt.buffer_size the size that is actually
read, it's less confusing that way.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 4b1b6df..2b4d8e1 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -3464,7 +3464,7 @@
         do
         {
             int terminated = 0;
-            len = opt.buffer_size - 1;
+            len = opt.buffer_size;
             memset( buf, 0, opt.buffer_size );
             ret = mbedtls_ssl_read( &ssl, buf, len );
 
@@ -3565,7 +3565,7 @@
     }
     else /* Not stream, so datagram */
     {
-        len = opt.buffer_size - 1;
+        len = opt.buffer_size;
         memset( buf, 0, opt.buffer_size );
 
         do