mirror of
https://github.com/php/php-src.git
synced 2025-08-18 15:08:55 +02:00
MF51: fix tiger on big endian platforms
This commit is contained in:
parent
a605fd39c4
commit
cc6ac87145
3 changed files with 43 additions and 8 deletions
|
@ -2,11 +2,13 @@ dnl $Id$
|
|||
dnl config.m4 for extension hash
|
||||
|
||||
PHP_ARG_ENABLE(hash, whether to enable hash support,
|
||||
[ --enable-hash Enable hash support])
|
||||
[ --disable-hash Disable hash support], yes)
|
||||
|
||||
if test "$PHP_HASH" != "no"; then
|
||||
AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension])
|
||||
|
||||
PHP_C_BIGENDIAN
|
||||
|
||||
AC_CHECK_SIZEOF(short, 2)
|
||||
AC_CHECK_SIZEOF(int, 4)
|
||||
AC_CHECK_SIZEOF(long, 4)
|
||||
|
|
|
@ -88,6 +88,24 @@
|
|||
} \
|
||||
feedforward
|
||||
|
||||
#define split_ex(str) \
|
||||
x0=str[0]; x1=str[1]; x2=str[2]; x3=str[3]; \
|
||||
x4=str[4]; x5=str[5]; x6=str[6]; x7=str[7];
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
# define split(str) \
|
||||
{ \
|
||||
int i; \
|
||||
php_hash_uint64 tmp[8]; \
|
||||
\
|
||||
for (i = 0; i < 64; ++i) { \
|
||||
((unsigned char *) tmp)[i^7] = ((unsigned char *) str)[i]; \
|
||||
} \
|
||||
split_ex(tmp); \
|
||||
}
|
||||
#else
|
||||
# define split split_ex
|
||||
#endif
|
||||
|
||||
#define tiger_compress(passes, str, state) \
|
||||
{ \
|
||||
register php_hash_uint64 a, b, c, tmpa, x0, x1, x2, x3, x4, x5, x6, x7; \
|
||||
|
@ -98,8 +116,7 @@
|
|||
b = state[1]; \
|
||||
c = state[2]; \
|
||||
\
|
||||
x0=str[0]; x1=str[1]; x2=str[2]; x3=str[3]; \
|
||||
x4=str[4]; x5=str[5]; x6=str[6]; x7=str[7]; \
|
||||
split(str); \
|
||||
\
|
||||
compress(passes); \
|
||||
\
|
||||
|
@ -127,7 +144,18 @@ static inline void TigerFinalize(PHP_TIGER_CTX *context)
|
|||
memset(&context->buffer[context->length], 0, 56 - context->length);
|
||||
}
|
||||
|
||||
#ifndef WORDS_BIGENDIAN
|
||||
memcpy(&context->buffer[56], &context->passed, sizeof(php_hash_uint64));
|
||||
#else
|
||||
context->buffer[56] = (unsigned char) (context->passed & 0xff);
|
||||
context->buffer[57] = (unsigned char) ((context->passed >> 8) & 0xff);
|
||||
context->buffer[58] = (unsigned char) ((context->passed >> 16) & 0xff);
|
||||
context->buffer[59] = (unsigned char) ((context->passed >> 24) & 0xff);
|
||||
context->buffer[60] = (unsigned char) ((context->passed >> 32) & 0xff);
|
||||
context->buffer[61] = (unsigned char) ((context->passed >> 40) & 0xff);
|
||||
context->buffer[62] = (unsigned char) ((context->passed >> 48) & 0xff);
|
||||
context->buffer[63] = (unsigned char) ((context->passed >> 56) & 0xff);
|
||||
#endif
|
||||
tiger_compress(context->passes, ((php_hash_uint64 *) context->buffer), context->state);
|
||||
}
|
||||
|
||||
|
@ -165,11 +193,12 @@ PHP_HASH_API void PHP_TIGERUpdate(PHP_TIGER_CTX *context, const unsigned char *i
|
|||
}
|
||||
|
||||
for (; i + 64 <= len; i += 64) {
|
||||
tiger_compress(context->passes, ((const php_hash_uint64 *) (input + i)), context->state);
|
||||
memcpy(context->buffer, &input[i], 64);
|
||||
tiger_compress(context->passes, ((const php_hash_uint64 *) context->buffer), context->state);
|
||||
context->passed += 512;
|
||||
}
|
||||
|
||||
memcpy(context->buffer, input + i, r);
|
||||
memset(&context->buffer[r], 0, 64-r);
|
||||
memcpy(context->buffer, &input[i], r);
|
||||
context->length = r;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,6 +23,10 @@
|
|||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#else
|
||||
#ifndef PHP_WIN32
|
||||
#include "php_config.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef PHP_WIN32
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue