highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xtea: give constants the correct type

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-08 03:44:18 +02:00
parent 89074e9066
commit 43bbc3f477
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/xtea.c
View File

@ -50,7 +50,7 @@ static void xtea_crypt_ecb(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
if (decrypt) { if (decrypt) {
#if CONFIG_SMALL #if CONFIG_SMALL
int i; int i;
uint32_t delta = 0x9E3779B9, sum = delta * 32; uint32_t delta = 0x9E3779B9U, sum = delta * 32;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
v1 -= (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (sum + ctx->key[(sum >> 11) & 3]); v1 -= (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (sum + ctx->key[(sum >> 11) & 3]);
@ -60,7 +60,7 @@ static void xtea_crypt_ecb(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
#else #else
#define DSTEP(SUM, K0, K1) \ #define DSTEP(SUM, K0, K1) \
v1 -= (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (SUM + K0); \ v1 -= (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (SUM + K0); \
v0 -= (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (SUM - 0x9E3779B9 + K1) v0 -= (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (SUM - 0x9E3779B9U + K1)
DSTEP(0xC6EF3720U, k2, k3); DSTEP(0xC6EF3720U, k2, k3);
DSTEP(0x28B7BD67U, k3, k2); DSTEP(0x28B7BD67U, k3, k2);
@ -103,7 +103,7 @@ static void xtea_crypt_ecb(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
} else { } else {
#if CONFIG_SMALL #if CONFIG_SMALL
int i; int i;
uint32_t sum = 0, delta = 0x9E3779B9; uint32_t sum = 0, delta = 0x9E3779B9U;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
v0 += (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (sum + ctx->key[sum & 3]); v0 += (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (sum + ctx->key[sum & 3]);
@ -113,7 +113,7 @@ static void xtea_crypt_ecb(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
#else #else
#define ESTEP(SUM, K0, K1) \ #define ESTEP(SUM, K0, K1) \
v0 += (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (SUM + K0);\ v0 += (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (SUM + K0);\
v1 += (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (SUM + 0x9E3779B9 + K1) v1 += (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (SUM + 0x9E3779B9U + K1)
ESTEP(0x00000000U, k0, k3); ESTEP(0x00000000U, k0, k3);
ESTEP(0x9E3779B9U, k1, k2); ESTEP(0x9E3779B9U, k1, k2);
ESTEP(0x3C6EF372U, k2, k1); ESTEP(0x3C6EF372U, k2, k1);