1 files changed, 22 insertions, 53 deletions

diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
index c80ecc4295..f671e722fa 100644
--- a/src/lib/libcrypto/bio/b_dump.c
+++ b/src/lib/libcrypto/bio/b_dump.c
@@ -62,32 +62,30 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bio_lcl.h"
+#include <openssl/bio.h>
 
 #define TRUNCATE
 #define DUMP_WIDTH      16
 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH-((i-(i>6?6:i)+3)/4))
 
-int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
-        void *u, const char *s, int len)
+int BIO_dump(BIO *bio, const char *s, int len)
         {
-        return BIO_dump_indent_cb(cb, u, s, len, 0);
+        return BIO_dump_indent(bio, 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)
+int BIO_dump_indent(BIO *bio, const char *s, int len, int indent)
         {
         int ret=0;
         char buf[288+1],tmp[20],str[128+1];
-        int i,j,rows,trc;
+        int i,j,rows,trunc;
         unsigned char ch;
         int dump_width;
-
-        trc=0;
-
+        
+        trunc=0;
+        
 #ifdef TRUNCATE
-        for(; (len > 0) && ((s[len-1] == ' ') || (s[len-1] == '\0')); len--)
-                trc++;
+        for(; (len > 0) && ((s[len-1] == ' ') || (s[len-1] == '\0')); len--) 
+                trunc++;
 #endif
 
         if (indent < 0)
@@ -98,7 +96,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
                 memset(str,' ',indent);
                 }
         str[indent]='\0';
-
+        
         dump_width=DUMP_WIDTH_LESS_INDENT(indent);
         rows=(len/dump_width);
         if ((rows*dump_width)<len)
@@ -119,7 +117,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
                                 {
                                 ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
                                 BIO_snprintf(tmp,sizeof tmp,"%02x%c",ch,
-                                        j==7?'-':' ');
+                                         j==7?'-':' ');
                                 BUF_strlcat(buf,tmp,sizeof buf);
                                 }
                         }
@@ -131,57 +129,28 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
                         ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
 #ifndef CHARSET_EBCDIC
                         BIO_snprintf(tmp,sizeof tmp,"%c",
-                                ((ch>=' ')&&(ch<='~'))?ch:'.');
+                                 ((ch>=' ')&&(ch<='~'))?ch:'.');
 #else
                         BIO_snprintf(tmp,sizeof tmp,"%c",
-                                ((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
-                                ? os_toebcdic[ch]
-                                : '.');
+                                 ((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
+                                 ? os_toebcdic[ch]
+                                 : '.');
 #endif
                         BUF_strlcat(buf,tmp,sizeof buf);
                         }
                 BUF_strlcat(buf,"\n",sizeof buf);
-                /* if this is the last call then update the ddt_dump thing so
-                 * that we will move the selection point in the debug window
+                /* if this is the last call then update the ddt_dump thing so that
+                 * we will move the selection point in the debug window 
                  */
-                ret+=cb((void *)buf,strlen(buf),u);
+                ret+=BIO_write(bio,(char *)buf,strlen(buf));
                 }
 #ifdef TRUNCATE
-        if (trc > 0)
+        if (trunc > 0)
                 {
                 BIO_snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str,
-                        len+trc);
-                ret+=cb((void *)buf,strlen(buf),u);
+                         len+trunc);
+                ret+=BIO_write(bio,(char *)buf,strlen(buf));
                 }
 #endif
         return(ret);
         }
-
-#ifndef OPENSSL_NO_FP_API
-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)
-        {
-        return BIO_dump_cb(write_fp, fp, s, len);
-        }
-int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent)
-        {
-        return BIO_dump_indent_cb(write_fp, fp, s, len, indent);
-        }
-#endif
-
-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)
-        {
-        return BIO_dump_cb(write_bio, bp, s, len);
-        }
-int BIO_dump_indent(BIO *bp, const char *s, int len, int indent)
-        {
-        return BIO_dump_indent_cb(write_bio, bp, s, len, indent);
-        }
-