diff options
Diffstat (limited to 'user/kwallet/kwallet-5.22.0-blowfish-endianness.patch')
| -rw-r--r-- | user/kwallet/kwallet-5.22.0-blowfish-endianness.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch new file mode 100644 index 000000000..9d76cc25c --- /dev/null +++ b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch @@ -0,0 +1,52 @@ +--- kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc.old 2016-12-03 21:12:17.000000000 +0000 ++++ kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc 2017-01-29 18:02:10.193293280 +0000 +@@ -31,9 +31,7 @@ + + #include "blowfishtables.h" + +-// DO NOT INCLUDE THIS. IT BREAKS KWALLET. +-// We need to live with -Wundef until someone really figures out the problem. +-//#include <QtCore/qglobal.h> // for Q_BYTE_ORDER and friends ++#include <QtGlobal> // for Q_BYTE_ORDER and friends + + BlowFish::BlowFish() + { +@@ -135,7 +133,7 @@ + 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; \ +@@ -154,12 +152,12 @@ + } + + 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 +@@ -178,12 +176,12 @@ + } + + 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 |