OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Mar-2007 19:18:29
Branch: HEAD Handle: 2007030218182800
Modified files:
openpkg-src/openssl openssl.patch openssl.spec
Log:
apply two more of our upstream patches
Summary:
Revision Changes Path
1.25 +34 -0 openpkg-src/openssl/openssl.patch
1.83 +1 -1 openpkg-src/openssl/openssl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssl/openssl.patch
============================================================================
$ cvs diff -u -r1.24 -r1.25 openssl.patch
--- openpkg-src/openssl/openssl.patch 28 Feb 2007 17:04:16 -0000 1.24
+++ openpkg-src/openssl/openssl.patch 2 Mar 2007 18:18:28 -0000 1.25
@@ -42,3 +42,37 @@
}
int EVP_CIPHER_nid(const EVP_CIPHER *cipher)
+Index: crypto/rand/rand_lib.c
+--- crypto/rand/rand_lib.c 30 Jan 2003 17:39:23 -0000 1.16
++++ crypto/rand/rand_lib.c 2 Mar 2007 17:54:31 -0000 1.16.2.1
+@@ -154,6 +154,7 @@
+ int RAND_bytes(unsigned char *buf, int num)
+ {
+ const RAND_METHOD *meth = RAND_get_rand_method();
++ memset(buf, 0, num);
+ if (meth && meth->bytes)
+ return meth->bytes(buf,num);
+ return(-1);
+@@ -162,6 +163,7 @@
+ int RAND_pseudo_bytes(unsigned char *buf, int num)
+ {
+ const RAND_METHOD *meth = RAND_get_rand_method();
++ memset(buf, 0, num);
+ if (meth && meth->pseudorand)
+ return meth->pseudorand(buf,num);
+ return(-1);
+Index: crypto/rand/randfile.c
+--- crypto/rand/randfile.c 21 May 2005 17:39:52 -0000 1.47.2.1
++++ crypto/rand/randfile.c 2 Mar 2007 17:44:55 -0000 1.47.2.2
+@@ -102,10 +102,8 @@
+
+ if (file == NULL) return(0);
+
+- i=stat(file,&sb);
+- /* If the state fails, put some crap in anyway */
++ if (stat(file,&sb) < 0) return(0);
+ RAND_add(&sb,sizeof(sb),0.0);
+- if (i < 0) return(0);
+ if (bytes == 0) return(ret);
+
+ in=fopen(file,"rb");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssl/openssl.spec
============================================================================
$ cvs diff -u -r1.82 -r1.83 openssl.spec
--- openpkg-src/openssl/openssl.spec 28 Feb 2007 17:04:16 -0000 1.82
+++ openpkg-src/openssl/openssl.spec 2 Mar 2007 18:18:28 -0000 1.83
@@ -33,7 +33,7 @@
Group: SSL
License: BSD-style
Version: 0.9.8e
-Release: 20070228
+Release: 20070302
# package options
%option with_zlib no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
