Author: blino
Date: Sat Dec 2 05:22:11 2006
New Revision: 90010
Modified:
packages/cooker/stepmania/current/SOURCES/StepMania-3.9-build_crypto.patch
Log:
update crypto patch with selected fixes from cryptopp CVS to fix x86_64 build
Modified:
packages/cooker/stepmania/current/SOURCES/StepMania-3.9-build_crypto.patch
==============================================================================
--- packages/cooker/stepmania/current/SOURCES/StepMania-3.9-build_crypto.patch
(original)
+++ packages/cooker/stepmania/current/SOURCES/StepMania-3.9-build_crypto.patch
Sat Dec 2 05:22:11 2006
@@ -1,5 +1,5 @@
---- StepMania-3.9-src/src/crypto51/misc.h-- 2006-04-19 12:51:30.000000000
-0400
-+++ StepMania-3.9-src/src/crypto51/misc.h 2006-04-19 12:53:13.000000000
-0400
+--- StepMania-3.9-src/src/crypto51/misc.h.crypto 2004-05-25
12:49:41.000000000 +0200
++++ StepMania-3.9-src/src/crypto51/misc.h 2006-12-02 04:26:24.000000000
+0100
@@ -142,7 +142,7 @@
inline bool IsAlignedOn(const void *p, unsigned int alignment)
@@ -9,8 +9,8 @@
}
template <class T>
---- StepMania-3.9-src/src/crypto51/misc.cpp-- 2006-04-19 12:51:35.000000000
-0400
-+++ StepMania-3.9-src/src/crypto51/misc.cpp 2006-04-19 12:53:23.000000000
-0400
+--- StepMania-3.9-src/src/crypto51/misc.cpp.crypto 2004-05-13
08:02:28.000000000 +0200
++++ StepMania-3.9-src/src/crypto51/misc.cpp 2006-12-02 05:13:29.000000000
+0100
@@ -4,6 +4,8 @@
#include "misc.h"
#include "words.h"
@@ -20,8 +20,26 @@
NAMESPACE_BEGIN(CryptoPP)
byte OAEP_P_DEFAULT[1];
---- StepMania-3.9-src/src/crypto51/strciphr.cpp-- 2006-04-19
12:51:42.000000000 -0400
-+++ StepMania-3.9-src/src/crypto51/strciphr.cpp 2006-04-19
12:53:28.000000000 -0400
+@@ -16,7 +18,7 @@
+
+ void xorbuf(byte *buf, const byte *mask, unsigned int count)
+ {
+- if (((unsigned int)buf | (unsigned int)mask | count) % WORD_SIZE == 0)
++ if (((size_t)buf | (size_t)mask | count) % WORD_SIZE == 0)
+ XorWords((word *)buf, (const word *)mask, count/WORD_SIZE);
+ else
+ {
+@@ -27,7 +29,7 @@
+
+ void xorbuf(byte *output, const byte *input, const byte *mask, unsigned int
count)
+ {
+- if (((unsigned int)output | (unsigned int)input | (unsigned int)mask |
count) % WORD_SIZE == 0)
++ if (((size_t)output | (size_t)input | (size_t)mask | count) % WORD_SIZE
== 0)
+ XorWords((word *)output, (const word *)input, (const word
*)mask, count/WORD_SIZE);
+ else
+ {
+--- StepMania-3.9-src/src/crypto51/strciphr.cpp.crypto 2005-01-03
00:21:05.000000000 +0100
++++ StepMania-3.9-src/src/crypto51/strciphr.cpp 2006-12-02
04:26:24.000000000 +0100
@@ -3,6 +3,8 @@
#include "pch.h"
#include "strciphr.h"
