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

Submitted by: Gisle Vanem

apps/s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index f9527ab..4eac434 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -223,7 +223,7 @@
 		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)

ssl/ssltest.c

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 0d61116..0be921f 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -470,7 +470,7 @@
 	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 @@
 
 	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 @@
 	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)