head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.3 OPENPKG_E1_MP:1.3 OPENPKG_E1_MP_2_STABLE:1.3 OPENPKG_E1_FP:1.3 OPENPKG_2_STABLE_MP:1.3 OPENPKG_2_STABLE_20061018:1.3 OPENPKG_2_STABLE_20060622:1.3 OPENPKG_2_STABLE:1.3.0.6 OPENPKG_2_STABLE_BP:1.3 OPENPKG_2_5_RELEASE:1.3 OPENPKG_2_5_SOLID:1.3.0.4 OPENPKG_2_5_SOLID_BP:1.3 OPENPKG_2_4_RELEASE:1.3 OPENPKG_2_4_SOLID:1.3.0.2 OPENPKG_2_4_SOLID_BP:1.3 OPENPKG_CW_FP:1.3 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.4 OPENPKG_2_3_SOLID_BP:1.2 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.2 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.1 OPENPKG_2_1_SOLID:1.1.0.2 OPENPKG_2_1_SOLID_BP:1.1; locks; strict; comment @# @; 1.8 date 2009.07.18.17.30.45; author rse; state Exp; branches; next 1.7; commitid NnQuCIBmwSN0zdWt; 1.7 date 2009.07.12.18.11.29; author rse; state Exp; branches; next 1.6; commitid Hzf114XVvL4XYrVt; 1.6 date 2009.07.08.08.41.41; author rse; state Exp; branches; next 1.5; commitid UqR7jrOflMvrXSUt; 1.5 date 2007.07.19.12.05.36; author rse; state Exp; branches; next 1.4; commitid 9V27nJ1LzwVhenqs; 1.4 date 2007.07.19.11.26.06; author rse; state Exp; branches; next 1.3; commitid ZNTUgP5rfeIJ0nqs; 1.3 date 2005.03.08.18.37.45; author rse; state Exp; branches; next 1.2; 1.2 date 2004.07.28.18.13.23; author rse; state Exp; branches 1.2.4.1; next 1.1; 1.1 date 2003.09.09.08.46.44; author rse; state Exp; branches; next ; 1.2.4.1 date 2005.03.25.18.41.23; author rse; state Exp; branches; next ; desc @@ 1.8 log @fix export mode stuff (not really required here but for the copy of beecrypt.patch in the bootstrap) @ text @Index: configure --- configure.orig 2009-07-12 09:19:15 +0200 +++ configure 2009-07-18 19:26:24 +0200 @@@@ -2821,7 +2821,7 @@@@ # Check whether --enable-expert-mode was given. if test "${enable_expert_mode+set}" = set; then enableval=$enable_expert_mode; - ac_enable_expert_mode=yes + ac_enable_expert_mode=$enableval else @@@@ -4502,13 +4502,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + : fi ac_ext=c Index: gnu.h.in --- gnu.h.in.orig 2009-06-18 21:56:25 +0200 +++ gnu.h.in 2009-07-18 19:24:37 +0200 @@@@ -59,15 +59,6 @@@@ @@TYPEDEF_UINT32_T@@ @@TYPEDEF_UINT64_T@@ -#if defined(__GNUC__) -# if !defined(__GNUC_PREREQ__) -# define __GNUC_PREREQ__(maj, min) (__GNUC__ > (maj) || __GNUC__ == (maj) && __GNUC_MINOR__ >= (min)) -# endif -#else -# define __GNUC__ 0 -# define __GNUC_PREREQ__(maj, min) 0 -#endif - /* WARNING: overriding this value is dangerous; some assembler routines * make assumptions about the size set by the configure script */ @ 1.7 log @upgrading package: beecrypt 4.2.0 -> 4.2.1 @ text @d3 10 a12 1 +++ configure 2009-07-12 20:08:49 +0200 d30 1 a30 1 +++ gnu.h.in 2009-07-12 20:08:49 +0200 @ 1.6 log @upgrading package: beecrypt 4.1.2 -> 4.2.0 @ text @d2 3 a4 3 --- configure.orig 2009-07-04 12:04:15 +0200 +++ configure 2009-07-07 23:55:17 +0200 @@@@ -4497,13 +4497,7 @@@@ d21 1 a21 1 +++ gnu.h.in 2009-07-07 23:55:17 +0200 a37 11 Index: include/Makefile.in --- include/Makefile.in.orig 2009-07-04 12:04:18 +0200 +++ include/Makefile.in 2009-07-08 10:36:03 +0200 @@@@ -509,7 +509,6 @@@@ beecrypt/c++/util/RandomAccess.h \ beecrypt/c++/util/Set.h \ \ -beecrypt/c++/util/concurrent/locks \ beecrypt/c++/util/concurrent/locks/Condition.h \ beecrypt/c++/util/concurrent/locks/Lock.h \ beecrypt/c++/util/concurrent/locks/ReentrantLock.h @ 1.5 log @fix out-of-bounds access in b64encode() @ text @d1 16 a16 71 Index: base64.c --- base64.c.orig 2004-12-19 21:21:04 +0100 +++ base64.c 2007-07-19 14:03:18 +0200 @@@@ -253,7 +253,6 @@@@ unsigned c; if (s == NULL) return NULL; - if (*s == '\0') return calloc(1, sizeof(*t)); 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:54:45 +0200 @@@@ -134,6 +134,9 @@@@ pxor 6144(%esi,%edx,8),s0 ') +') +ifdef(`USE_MMX',` + define(`elr',` movd 0(%ebp),s0 movd t0,%eax @@@@ -253,6 +256,9 @@@@ ') +') +ifdef(`USE_MMX',` + C_FUNCTION_BEGIN(aesEncrypt) pushl %edi pushl %esi @@@@ -364,6 +370,9 @@@@ pxor 6144(%esi,%edx,8),t2 ') +') +ifdef(`USE_MMX',` + define(`dsft',` movd $1+ 0(%ebp),s0 movd t0,%eax @@@@ -490,6 +499,9 @@@@ pxor t3,s2 ') +') +ifdef(`USE_MMX',` + define(`dblock',` sxrk d18 1 d20 3 a22 3 --- gnu.h.in.orig 2004-12-19 21:18:48 +0100 +++ gnu.h.in 2007-07-19 13:54:45 +0200 @@@@ -48,15 +48,6 @@@@ d38 11 @ 1.4 log @fix encoding for buffers starting with a NUL byte by removing bogus code @ text @d3 1 a3 1 +++ base64.c 2007-07-19 13:18:37 +0200 d12 18 d32 1 a32 1 +++ gas/aesopt.x86.m4 2007-07-19 13:15:20 +0200 d75 1 a75 1 +++ gnu.h.in 2007-07-19 13:15:20 +0200 @ 1.3 log @remove GNU gcc specific stuff which makes trouble for those including with non-GCC (because then __GNUC__ would be defined) and it is not used inside BeeCrypt at all @ text @d1 11 d13 2 a14 2 --- gas/aesopt.x86.m4.orig 2004-06-13 13:37:23 +0200 +++ gas/aesopt.x86.m4 2004-07-28 20:02:07 +0200 d57 1 a57 1 +++ gnu.h.in 2005-03-08 19:34:03 +0100 @ 1.2 log @upgrading package: beecrypt 3.1.0 -> 4.0.0 @ text @d44 19 @ 1.2.4.1 log @MFC: remove GNU gcc specifics for portability @ text @a43 19 Index: gnu.h.in --- gnu.h.in.orig 2004-12-19 21:18:48 +0100 +++ gnu.h.in 2005-03-08 19:34:03 +0100 @@@@ -48,15 +48,6 @@@@ @@TYPEDEF_UINT32_T@@ @@TYPEDEF_UINT64_T@@ -#if defined(__GNUC__) -# if !defined(__GNUC_PREREQ__) -# define __GNUC_PREREQ__(maj, min) (__GNUC__ > (maj) || __GNUC__ == (maj) && __GNUC_MINOR__ >= (min)) -# endif -#else -# define __GNUC__ 0 -# define __GNUC_PREREQ__(maj, min) 0 -#endif - /* WARNING: overriding this value is dangerous; some assembler routines * make assumptions about the size set by the configure script */ @ 1.1 log @include patch from bootstrap package here, too @ text @d2 3 a4 7 =================================================================== RCS file: /CVSROOT/opkg/cvsbase/beecrypt/gas/aesopt.x86.m4,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 aesopt.x86.m4 --- gas/aesopt.x86.m4 9 Jun 2003 08:35:39 -0000 1.1.1.1 +++ gas/aesopt.x86.m4 4 Sep 2003 07:26:08 -0000 @@@@ -133,6 +133,9 @@@@ d14 1 a14 1 @@@@ -252,6 +255,9 @@@@ d24 1 a24 1 @@@@ -363,6 +369,9 @@@@ d34 1 a34 2 @@@@ -488,6 +497,9 @@@@ pxor t2,s1 d37 1 a37 1 + d40 1 a40 1 a42 49 Index: gas/mpopt.x86.m4 =================================================================== RCS file: /CVSROOT/opkg/cvsbase/beecrypt/gas/mpopt.x86.m4,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 mpopt.x86.m4 --- gas/mpopt.x86.m4 4 Jun 2003 17:39:58 -0000 1.1.1.1 +++ gas/mpopt.x86.m4 4 Sep 2003 07:26:08 -0000 @@@@ -29,7 +29,7 @@@@ movl 12(%esp),%edi xorl %eax,%eax - repz stosl + repz; stosl popl %edi ret @@@@ -43,7 +43,7 @@@@ movl 12(%esp),%edi movl 16(%esp),%eax - repz stosl + repz; stosl popl %edi ret Index: gas/sha1opt.x86.m4 =================================================================== RCS file: /CVSROOT/opkg/cvsbase/beecrypt/gas/sha1opt.x86.m4,v retrieving revision 1.1.1.1 diff -u -u -r1.1.1.1 sha1opt.x86.m4 --- gas/sha1opt.x86.m4 8 May 2003 17:52:54 -0000 1.1.1.1 +++ gas/sha1opt.x86.m4 4 Sep 2003 07:26:08 -0000 @@@@ -21,13 +21,13 @@@@ include(config.m4) include(ASM_SRCDIR/x86.m4) - .equ K00, 0x5a827999 - .equ K20, 0x6ed9eba1 - .equ K40, 0x8f1bbcdc - .equ K60, 0xca62c1d6 + .set K00, 0x5a827999 + .set K20, 0x6ed9eba1 + .set K40, 0x8f1bbcdc + .set K60, 0xca62c1d6 - .equ PARAM_H, 0 - .equ PARAM_DATA, 20 + .set PARAM_H, 0 + .set PARAM_DATA, 20 a43 2 define(`subround1',` movl $2,%ecx @