forked from rpms/openssl
- set buffering to none on stdio/stdout FILE when bufsize is set (#200580)
patch by IBM
This commit is contained in:
parent
c1d3bf9a12
commit
2020821670
32
openssl-0.9.8b-enc-bufsize.patch
Normal file
32
openssl-0.9.8b-enc-bufsize.patch
Normal file
@ -0,0 +1,32 @@
|
||||
--- 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());
|
@ -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 @@ Patch35: openssl-0.9.7-beta5-version-add-engines.patch
|
||||
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 @@ from other formats to the formats used by the OpenSSL toolkit.
|
||||
%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 @@ rm -rf $RPM_BUILD_ROOT/%{_bindir}/openssl_fips_fingerprint
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Wed Aug 2 2006 Tomas Mraz <tmraz@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@redhat.com> - 0.9.8b-4.1
|
||||
- rebuild with new binutils (#200330)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user