From c112323dd5d107b199a6d951f8be4c882ff0fba1 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Wed, 13 Nov 2002 18:09:27 +0000
Subject: [PATCH] This didn't get to the 0.9.8-dev thread...

---
 apps/pkcs12.c        |  2 +-
 crypto/asn1/a_time.c |  2 +-
 crypto/asn1/t_pkey.c | 10 ++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 64b4b32be..536cf57c1 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -538,7 +538,7 @@ int MAIN(int argc, char **argv)
 #endif
 
 	if(!noprompt &&
-		EVP_read_pw_string(pass, 50, "Enter Export Password:", 1))
+		EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1))
 		{
 	    	BIO_printf (bio_err, "Can't read Password\n");
 	    	goto export_end;
diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index 27ddd3089..6e5e9d845 100644
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -152,7 +152,7 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZE
 	if (t->data[0] >= '5') strcpy(str, "19");
 	else strcpy(str, "20");
 
-	strcat(str, (char *)t->data);
+	BUF_strlcat(str, (char *)t->data, t->length+2);
 
 	return ret;
 	}
diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
index bd89c1dc1..73f32ff84 100644
--- a/crypto/asn1/t_pkey.c
+++ b/crypto/asn1/t_pkey.c
@@ -562,18 +562,12 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
 	     int off)
 	{
 	int n,i;
-	char str[128];
 	const char *neg;
 
 	if (num == NULL) return(1);
 	neg = (BN_get_sign(num))?"-":"";
-	if (off)
-		{
-		if (off > 128) off=128;
-		memset(str,' ',off);
-		if (BIO_write(bp,str,off) <= 0) return(0);
-		}
-
+	if(!BIO_indent(bp,off,128))
+		return 0;
 	if (BN_is_zero(num))
 		{
 		if (BIO_printf(bp, "%s 0\n", number) <= 0)