[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_0_2-stable has been updated
       via  773da093b1b9a63ae9c94cae756848011686caa0 (commit)
      from  575c69f97ca7c8cfaf2a448272f7a1615308acdd (commit)


- Log -----------------------------------------------------------------
commit 773da093b1b9a63ae9c94cae756848011686caa0
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Feb 12 09:28:33 2018 +0100

    Remove code that prints "<SPACES/NULS>" in hexdumps
    when the data block ends with SPACEs or NULs.
    
    The problem is, you can't see if the data ends
    with SPACE or NUL or a combination of both.
    
    This can happen for instance with
    openssl rsautl -decrypt -hexdump
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5332)
    
    (cherry picked from commit 751485c6522f10006ba9f6cf90d719ea190e2201)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/b_dump.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
index 86a98e1..fcfd699 100644
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -64,7 +64,6 @@
 #include "cryptlib.h"
 #include "bio_lcl.h"
 
-#define TRUNCATE
 #define DUMP_WIDTH      16
 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH-((i-(i>6?6:i)+3)/4))
 
@@ -79,17 +78,10 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
 {
     int ret = 0;
     char buf[288 + 1], tmp[20], str[128 + 1];
-    int i, j, rows, trc;
+    int i, j, rows;
     unsigned char ch;
     int dump_width;
 
-    trc = 0;
-
-#ifdef TRUNCATE
-    for (; (len > 0) && ((s[len - 1] == ' ') || (s[len - 1] == '\0')); len--)
-        trc++;
-#endif
-
     if (indent < 0)
         indent = 0;
     if (indent) {
@@ -140,14 +132,7 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
          */
         ret += cb((void *)buf, strlen(buf), u);
     }
-#ifdef TRUNCATE
-    if (trc > 0) {
-        BIO_snprintf(buf, sizeof(buf), "%s%04x - <SPACES/NULS>\n", str,
-                     len + trc);
-        ret += cb((void *)buf, strlen(buf), u);
-    }
-#endif
-    return (ret);
+    return ret;
 }
 
 #ifndef OPENSSL_NO_FP_API