From a33aad878a9a5fccd4bbd48c79f0059e3ebbd670 Mon Sep 17 00:00:00 2001 From: Debian/Kubuntu Qt/KDE Maintainers Date: Sat, 9 Jul 2016 12:31:10 +0200 Subject: [PATCH] blowfish_endianess Gbp-Pq: Name blowfish_endianess.diff --- src/runtime/kwalletd/backend/blowfish.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/runtime/kwalletd/backend/blowfish.cc b/src/runtime/kwalletd/backend/blowfish.cc index c545bc2..e81256e 100644 --- a/src/runtime/kwalletd/backend/blowfish.cc +++ b/src/runtime/kwalletd/backend/blowfish.cc @@ -21,10 +21,7 @@ // DO NOT INCLUDE THIS. IT BREAKS KWALLET. // We need to live with -Wundef until someone really figures out the problem. -//#include // for Q_BYTE_ORDER and friends -// Workaround for -Wundef -#define Q_BIG_ENDIAN 1 -#define Q_BYTE_ORDER Q_BIG_ENDIAN +#include // for Q_BYTE_ORDER and friends BlowFish::BlowFish() { @@ -126,7 +123,7 @@ bool BlowFish::setKey(void *key, int bitlength) return init(); } -#if Q_BYTE_ORDER == Q_BIG_ENDIAN +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN #define shuffle(x) do { \ uint32_t r = x; \ x = (r & 0xff000000) >> 24; \ @@ -145,12 +142,12 @@ int BlowFish::encrypt(void *block, int len) } for (int i = 0; i < len / _blksz; i++) { -#if Q_BYTE_ORDER == Q_BIG_ENDIAN +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN shuffle(*d); shuffle(*(d + 1)); #endif encipher(d, d + 1); -#if Q_BYTE_ORDER == Q_BIG_ENDIAN +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN shuffle(*d); shuffle(*(d + 1)); #endif @@ -169,12 +166,12 @@ int BlowFish::decrypt(void *block, int len) } for (int i = 0; i < len / _blksz; i++) { -#if Q_BYTE_ORDER == Q_BIG_ENDIAN +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN shuffle(*d); shuffle(*(d + 1)); #endif decipher(d, d + 1); -#if Q_BYTE_ORDER == Q_BIG_ENDIAN +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN shuffle(*d); shuffle(*(d + 1)); #endif -- 2.30.2