2020821
--- openssl-0.9.8a/apps/enc.c.orig	2006-07-27 18:37:05.000000000 -0500
2020821
+++ openssl-0.9.8a/apps/enc.c	2006-07-27 18:38:30.000000000 -0500
2020821
@@ -340,7 +340,7 @@
2020821
 			}
2020821
 
2020821
 		/* It must be large enough for a base64 encoded line */
2020821
-		if (n < 80) n=80;
2020821
+		if (base64 && n < 80) n=80;
2020821
 
2020821
 		bsize=(int)n;
2020821
 		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
2020821
@@ -370,7 +370,11 @@
2020821
 		}
2020821
 
2020821
 	if (inf == NULL)
2020821
+	        {
2020821
+		if (bufsize != NULL)
2020821
+			setvbuf(stdin, (char *)NULL, _IONBF, 0);
2020821
 		BIO_set_fp(in,stdin,BIO_NOCLOSE);
2020821
+	        }
2020821
 	else
2020821
 		{
2020821
 		if (BIO_read_filename(in,inf) <= 0)
2020821
@@ -421,6 +425,8 @@
2020821
 	if (outf == NULL)
2020821
 		{
2020821
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
2020821
+		if (bufsize != NULL)
2020821
+			setvbuf(stdout, (char *)NULL, _IONBF, 0);
2020821
 #ifdef OPENSSL_SYS_VMS
2020821
 		{
2020821
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());