[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.13-3-g37f1a42
by Werner Koch
cvs at cvs.gnupg.org
Fri Jan 11 15:44:33 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, STABLE-BRANCH-1-4 has been updated
via 37f1a427440b9bb4374bf7d878f17190df75918b (commit)
from ff5cfadc2c402ebc3884ad2575bc5a51f0067f56 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 37f1a427440b9bb4374bf7d878f17190df75918b
Author: Werner Koch <wk at gnupg.org>
Date: Fri Jan 11 15:10:38 2013 +0100
Fix idea.c for big endian CPUs.
* cipher/idea.c: Replace use of WORDS_BIGENDIAN by BIG_ENDIAN_HOST.
--
GnuPG-bug-id: 1461
diff --git a/cipher/idea.c b/cipher/idea.c
index 8cda764..a2d8dfe 100644
--- a/cipher/idea.c
+++ b/cipher/idea.c
@@ -178,7 +178,7 @@ cipher( byte *outbuf, const byte *inbuf, u16 *key )
u16 x1, x2, x3,x4, s2, s3;
u16 *in, *out;
int r = IDEA_ROUNDS;
- #define MUL(x,y) \
+#define MUL(x,y) \
do {u16 _t16; u32 _t32; \
if( (_t16 = (y)) ) { \
if( (x = (x)&0xffff) ) { \
@@ -201,12 +201,12 @@ cipher( byte *outbuf, const byte *inbuf, u16 *key )
x2 = *in++;
x3 = *in++;
x4 = *in;
- #ifndef WORDS_BIGENDIAN
+#ifndef BIG_ENDIAN_HOST
x1 = (x1>>8) | (x1<<8);
x2 = (x2>>8) | (x2<<8);
x3 = (x3>>8) | (x3<<8);
x4 = (x4>>8) | (x4<<8);
- #endif
+#endif
do {
MUL(x1, *key++);
x2 += *key++;
@@ -234,18 +234,18 @@ cipher( byte *outbuf, const byte *inbuf, u16 *key )
MUL(x4, *key);
out = (u16*)outbuf;
- #ifndef WORDS_BIGENDIAN
+#ifndef BIG_ENDIAN_HOST
*out++ = (x1>>8) | (x1<<8);
*out++ = (x3>>8) | (x3<<8);
*out++ = (x2>>8) | (x2<<8);
*out = (x4>>8) | (x4<<8);
- #else
+#else
*out++ = x1;
*out++ = x3;
*out++ = x2;
*out = x4;
- #endif
- #undef MUL
+#endif
+#undef MUL
}
-----------------------------------------------------------------------
Summary of changes:
cipher/idea.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list