use BIO_snprintf() instead of snprintf + use BIO_FP_TEXT for text output

Submitted by: Gisle Vanem

diff --git a/apps/s_client.c b/apps/s_client.c
index f9527ab5c736b73e2261b2f3c170b39fb4a51081..4eac4341c403c2812a64b1a0f3fedc7f7a7af5d3 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -223,7 +223,7 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
                BIO_printf(bio_c_out, "Received PSK identity hint '%s'\n", hint);
 
        /* lookup PSK identity and PSK key based on the given identity hint here */
-       ret = snprintf(identity, max_identity_len, psk_identity);
+       ret = BIO_snprintf(identity, max_identity_len, psk_identity);
        if (ret < 0 || (unsigned int)ret > max_identity_len)
                goto out_err;
        if (c_debug)

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 0d611161ab954f46fa90d10915cf770a40bf0c68..0be921f7f2dae633e3115f860bf324a35c8ea6b5 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -470,7 +470,7 @@ int main(int argc, char *argv[])
        debug = 0;
        cipher = 0;
 
-       bio_err=BIO_new_fp(stderr,BIO_NOCLOSE); 
+       bio_err=BIO_new_fp(stderr,BIO_NOCLOSE|BIO_FP_TEXT);     
 
        CRYPTO_set_locking_callback(lock_dbg_cb);
 
@@ -489,7 +489,7 @@ int main(int argc, char *argv[])
 
        RAND_seed(rnd_seed, sizeof rnd_seed);
 
-       bio_stdout=BIO_new_fp(stdout,BIO_NOCLOSE);
+       bio_stdout=BIO_new_fp(stdout,BIO_NOCLOSE|BIO_FP_TEXT);
 
        argc--;
        argv++;
@@ -2350,7 +2350,7 @@ static unsigned int psk_client_callback(SSL *ssl, const char *hint, char *identi
        int ret;
        unsigned int psk_len = 0;
 
-       ret = snprintf(identity, max_identity_len, "Client_identity");
+       ret = BIO_snprintf(identity, max_identity_len, "Client_identity");
        if (ret < 0)
                goto out_err;
        if (debug)