rpms/openssl/devel openssl-0.9.8b-enc-bufsize.patch, NONE, 1.1 openssl.spec, 1.81, 1.82

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2622

Modified Files:
	openssl.spec 
Added Files:
	openssl-0.9.8b-enc-bufsize.patch 
Log Message:
* Wed Aug  2 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-5
- set buffering to none on stdio/stdout FILE when bufsize is set (#200580)
  patch by IBM


openssl-0.9.8b-enc-bufsize.patch:
 enc.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE openssl-0.9.8b-enc-bufsize.patch ---
--- openssl-0.9.8a/apps/enc.c.orig	2006-07-27 18:37:05.000000000 -0500
+++ openssl-0.9.8a/apps/enc.c	2006-07-27 18:38:30.000000000 -0500
@@ -340,7 +340,7 @@
 			}
 
 		/* 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);
@@ -370,7 +370,11 @@
 		}
 
 	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)
@@ -421,6 +425,8 @@
 	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());


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- openssl.spec	29 Jul 2006 02:54:33 -0000	1.81
+++ openssl.spec	2 Aug 2006 18:18:43 -0000	1.82
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8b
-Release: 4.1
+Release: 5
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -48,6 +48,7 @@
 Patch36: openssl-0.9.8a-use-poll.patch
 Patch38: openssl-0.9.8a-reuse-cipher-change.patch
 Patch39: openssl-0.9.8b-ipv6-apps.patch
+Patch40: openssl-0.9.8b-enc-bufsize.patch
 # Backported fixes including security fixes
 Patch51: openssl-0.9.8b-block-padding.patch
 Patch52: openssl-0.9.8b-pkcs12-fix.patch
@@ -111,6 +112,7 @@
 %patch36 -p1 -b .use-poll
 %patch38 -p1 -b .cipher-change
 %patch39 -p1 -b .ipv6-apps
+%patch40 -p1 -b .enc-bufsize
 
 %patch51 -p1 -b .block-padding
 %patch52 -p1 -b .pkcs12-fix
@@ -351,6 +353,10 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Aug  2 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-5
+- set buffering to none on stdio/stdout FILE when bufsize is set (#200580)
+  patch by IBM
+
 * Fri Jul 28 2006 Alexandre Oliva <aoliva at redhat.com> - 0.9.8b-4.1
 - rebuild with new binutils (#200330)