From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 22 Sep 2006 17:15:04 +0000 (+0000)
Subject: Fix from HEAD.
X-Git-Tag: OpenSSL_0_9_7l~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8db3f4ace9bd7fa147c52f31d4c964630ea1a727;p=oweals%2Fopenssl.git

Fix from HEAD.
---

diff --git a/apps/enc.c b/apps/enc.c
index 6f3161395e..368b2aeea6 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -346,7 +346,7 @@ bad:
 			}
 
 		/* It must be large enough for a base64 encoded line */
-		if (n < 80) n=80;
+		if (base64 && n < 80) n=80;
 
 		bsize=(int)n;
 		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
@@ -376,7 +376,11 @@ bad:
 		}
 
 	if (inf == NULL)
+	        {
+		if (bufsize != NULL)
+			setvbuf(stdin, (char *)NULL, _IONBF, 0);
 		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+	        }
 	else
 		{
 		if (BIO_read_filename(in,inf) <= 0)
@@ -427,6 +431,8 @@ bad:
 	if (outf == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+		if (bufsize != NULL)
+			setvbuf(stdout, (char *)NULL, _IONBF, 0);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());