Replace FUNCerr with ERR_raise_data

[openssl.git] / crypto / bio / b_dump.c

diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
index f5391406e87b2654c9fe7cd04b470b691f54654f..e4ad3615f4ea3d5220349fa103f93ee3718d1eff 100644 (file)
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -14,34 +14,27 @@
 #include <stdio.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))
 
 #define SPACE(buf, pos, n)   (sizeof(buf) - (pos) > (n))
 
 int BIO_dump_cb(int (*cb) (const void *data, size_t len, void *u),
-                void *u, const char *s, int len)
+                void *u, const void *s, int len)
 {
     return BIO_dump_indent_cb(cb, u, s, len, 0);
 }
 
 int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
-                       void *u, const char *s, int len, int indent)
+                       void *u, const void *v, int len, int indent)
 {
+    const unsigned char *s = v;
     int ret = 0;
     char buf[288 + 1];
-    int i, j, rows, trc, n;
+    int i, j, rows, n;
     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;
     else if (indent > 128)
@@ -59,7 +52,7 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
                 if (((i * dump_width) + j) >= len) {
                     strcpy(buf + n, "   ");
                 } else {
-                    ch = ((unsigned char)*(s + i * dump_width + j)) & 0xff;
+                    ch = *(s + i * dump_width + j) & 0xff;
                     BIO_snprintf(buf + n, 4, "%02x%c", ch,
                                  j == 7 ? '-' : ' ');
                 }
@@ -74,7 +67,7 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
             if (((i * dump_width) + j) >= len)
                 break;
             if (SPACE(buf, n, 1)) {
-                ch = ((unsigned char)*(s + i * dump_width + j)) & 0xff;
+                ch = *(s + i * dump_width + j) & 0xff;
 #ifndef CHARSET_EBCDIC
                 buf[n++] = ((ch >= ' ') && (ch <= '~')) ? ch : '.';
 #else
@@ -95,13 +88,6 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
          */
         ret += cb((void *)buf, n, u);
     }
-#ifdef TRUNCATE
-    if (trc > 0) {
-        n = BIO_snprintf(buf, sizeof(buf), "%*s%04x - <SPACES/NULS>\n",
-                         indent, "", len + trc);
-        ret += cb((void *)buf, n, u);
-    }
-#endif
     return ret;
 }
 
@@ -111,12 +97,12 @@ static int write_fp(const void *data, size_t len, void *fp)
     return UP_fwrite(data, len, 1, fp);
 }
 
-int BIO_dump_fp(FILE *fp, const char *s, int len)
+int BIO_dump_fp(FILE *fp, const void *s, int len)
 {
     return BIO_dump_cb(write_fp, fp, s, len);
 }
 
-int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent)
+int BIO_dump_indent_fp(FILE *fp, const void *s, int len, int indent)
 {
     return BIO_dump_indent_cb(write_fp, fp, s, len, indent);
 }
@@ -127,19 +113,20 @@ static int write_bio(const void *data, size_t len, void *bp)
     return BIO_write((BIO *)bp, (const char *)data, len);
 }
 
-int BIO_dump(BIO *bp, const char *s, int len)
+int BIO_dump(BIO *bp, const void *s, int len)
 {
     return BIO_dump_cb(write_bio, bp, s, len);
 }
 
-int BIO_dump_indent(BIO *bp, const char *s, int len, int indent)
+int BIO_dump_indent(BIO *bp, const void *s, int len, int indent)
 {
     return BIO_dump_indent_cb(write_bio, bp, s, len, indent);
 }
 
-int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,
+int BIO_hex_string(BIO *out, int indent, int width, const void *data,
                    int datalen)
 {
+    const unsigned char *d = data;
     int i, j = 0;
 
     if (datalen < 1)
@@ -149,7 +136,7 @@ int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,
         if (i && !j)
             BIO_printf(out, "%*s", indent, "");
 
-        BIO_printf(out, "%02X:", data[i]);
+        BIO_printf(out, "%02X:", d[i]);
 
         j = (j + 1) % width;
         if (!j)
@@ -158,6 +145,6 @@ int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,
 
     if (i && !j)
         BIO_printf(out, "%*s", indent, "");
-    BIO_printf(out, "%02X", data[datalen - 1]);
+    BIO_printf(out, "%02X", d[datalen - 1]);
     return 1;
 }