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: 19-Jul-2007 14:05:37
Branch: HEAD Handle: 2007071913053600
Modified files:
openpkg-src/beecrypt beecrypt.patch
Log:
fix out-of-bounds access in b64encode()
Summary:
Revision Changes Path
1.5 +21 -3 openpkg-src/beecrypt/beecrypt.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/beecrypt/beecrypt.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 beecrypt.patch
--- openpkg-src/beecrypt/beecrypt.patch 19 Jul 2007 11:26:06 -0000
1.4
+++ openpkg-src/beecrypt/beecrypt.patch 19 Jul 2007 12:05:36 -0000
1.5
@@ -1,6 +1,6 @@
Index: base64.c
--- base64.c.orig 2004-12-19 21:21:04 +0100
-+++ base64.c 2007-07-19 13:18:37 +0200
++++ base64.c 2007-07-19 14:03:18 +0200
@@ -253,7 +253,6 @@
unsigned c;
@@ -9,9 +9,27 @@
if (ns == 0) ns = strlen((const char*) s);
nt = ((ns + 2) / 3) * 4;
+@@ -275,7 +274,7 @@
+ {
+ c = *s++;
+ *te++ = b64enc[ (c >> 2) ], lc++;
+- *te++ = b64enc[ ((c & 0x3) << 4) | (*s >> 4) ], lc++;
++ *te++ = b64enc[ ((c & 0x3) << 4) | (((ns-1) > 0 ? *s : 0) >> 4)
], lc++;
+ if (--ns == 0)
+ {
+ *te++ = '=';
+@@ -283,7 +282,7 @@
+ continue;
+ }
+ c = *s++;
+- *te++ = b64enc[ ((c & 0xf) << 2) | (*s >> 6) ], lc++;
++ *te++ = b64enc[ ((c & 0xf) << 2) | (((ns-1) > 0 ? *s : 0) >> 6)
], lc++;
+ if (--ns == 0)
+ {
+ *te++ = '=';
Index: gas/aesopt.x86.m4
--- gas/aesopt.x86.m4.orig 2004-08-21 15:37:40 +0200
-+++ gas/aesopt.x86.m4 2007-07-19 13:15:20 +0200
++++ gas/aesopt.x86.m4 2007-07-19 13:54:45 +0200
@@ -134,6 +134,9 @@
pxor 6144(%esi,%edx,8),s0
')
@@ -54,7 +72,7 @@
Index: gnu.h.in
--- gnu.h.in.orig 2004-12-19 21:18:48 +0100
-+++ gnu.h.in 2007-07-19 13:15:20 +0200
++++ gnu.h.in 2007-07-19 13:54:45 +0200
@@ -48,15 +48,6 @@
@TYPEDEF_UINT32_T@
@TYPEDEF_UINT64_T@
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
