PACKETise ServerHello processing

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

diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 2a447c3f6ce225d88f1793ee7de1bf5a0173aa81..f0dfe8268cf8d59767aeac6edf14c4b75e9a1d24 100644 (file)
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

-#include "cryptlib.h"
+#include "internal/cryptlib.h"

 #include <openssl/bio.h>
 #include <openssl/err.h>
 
 #include <openssl/bio.h>
 #include <openssl/err.h>
 


@@ -67,17 +67,20 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
                         int argi, long argl, long ret)
 {
     BIO *b;
                         int argi, long argl, long ret)
 {
     BIO *b;

-    MS_STATIC char buf[256];
+    char buf[256];

     char *p;
     long r = 1;
     char *p;
     long r = 1;

+    int len;

     size_t p_maxlen;
 
     if (BIO_CB_RETURN & cmd)
         r = ret;
 
     size_t p_maxlen;
 
     if (BIO_CB_RETURN & cmd)
         r = ret;
 

-    BIO_snprintf(buf, sizeof buf, "BIO[%08lX]:", (unsigned long)bio);
-    p = &(buf[14]);
-    p_maxlen = sizeof buf - 14;
+    len = BIO_snprintf(buf,sizeof buf,"BIO[%p]: ",(void *)bio);
+
+    p = buf + len;
+    p_maxlen = sizeof(buf) - len;
+

     switch (cmd) {
     case BIO_CB_FREE:
         BIO_snprintf(p, p_maxlen, "Free - %s\n", bio->method->name);
     switch (cmd) {
     case BIO_CB_FREE:
         BIO_snprintf(p, p_maxlen, "Free - %s\n", bio->method->name);