Flense all use of BIO_snprintf from ssl source - use the real one instead,

and allow for the normal posix mandated return values instead of the
nonstandard one from BIO_snprintf.
ok miod@

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 269d171615..664147cb6a 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/ssl/ssltest.c
@@ -1820,8 +1820,8 @@ process_proxy_debug(int indent, const char *format, ...)
         char my_format[256];
         va_list args;
 
-        BIO_snprintf(my_format, sizeof(my_format), "%*.*s %s",
-        indent, indent, indentation, format);
+        (void) snprintf(my_format, sizeof(my_format), "%*.*s %s",
+            indent, indent, indentation, format);
 
         va_start(args, format);
         vfprintf(stderr, my_format, args);
@@ -2311,8 +2311,8 @@ psk_client_callback(SSL *ssl, const char *hint, char *identity,
         int ret;
         unsigned int psk_len = 0;
 
-        ret = BIO_snprintf(identity, max_identity_len, "Client_identity");
-        if (ret < 0)
+        ret = snprintf(identity, max_identity_len, "Client_identity");
+        if (ret >= max_identity_len || ret == -1)
                 goto out_err;
         if (debug)
                 fprintf(stderr, "client: created identity '%s' len=%d\n", identity, ret);