[neon/kde/kwallet/Neon/release-lts] debian/patches: refresh patch

Jonathan Riddell null at kde.org
Mon Mar 15 12:59:40 GMT 2021


Git commit 27208ed805f0d5d020bd61693b835ba894061441 by Jonathan Riddell.
Committed on 15/03/2021 at 12:59.
Pushed by jriddell into branch 'Neon/release-lts'.

refresh patch

M  +8    -8    debian/patches/blowfish_endianess.diff

https://invent.kde.org/neon/kde/kwallet/commit/27208ed805f0d5d020bd61693b835ba894061441

diff --git a/debian/patches/blowfish_endianess.diff b/debian/patches/blowfish_endianess.diff
index 1cc3fd1..3835aa6 100644
--- a/debian/patches/blowfish_endianess.diff
+++ b/debian/patches/blowfish_endianess.diff
@@ -1,8 +1,8 @@
-Index: kwallet-5.71.0/src/runtime/kwalletd/backend/blowfish.cc
+Index: kwallet-5.80.0/src/runtime/kwalletd/backend/blowfish.cc
 ===================================================================
---- kwallet-5.71.0.orig/src/runtime/kwalletd/backend/blowfish.cc
-+++ kwallet-5.71.0/src/runtime/kwalletd/backend/blowfish.cc
-@@ -33,10 +33,10 @@
+--- kwallet-5.80.0.orig/src/runtime/kwalletd/backend/blowfish.cc
++++ kwallet-5.80.0/src/runtime/kwalletd/backend/blowfish.cc
+@@ -21,10 +21,10 @@
  
  // DO NOT INCLUDE THIS. IT BREAKS KWALLET.
  // We need to live with -Wundef until someone really figures out the problem.
@@ -16,16 +16,16 @@ Index: kwallet-5.71.0/src/runtime/kwalletd/backend/blowfish.cc
  
  BlowFish::BlowFish()
  {
-@@ -138,7 +138,7 @@ bool BlowFish::setKey(void *key, int bit
+@@ -126,7 +126,7 @@ bool BlowFish::setKey(void *key, int bit
      return init();
  }
- 
+ // clang-format off
 -#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;    \
-@@ -157,12 +157,12 @@ int BlowFish::encrypt(void *block, int l
+@@ -146,12 +146,12 @@ int BlowFish::encrypt(void *block, int l
      }
  
      for (int i = 0; i < len / _blksz; i++) {
@@ -40,7 +40,7 @@ Index: kwallet-5.71.0/src/runtime/kwalletd/backend/blowfish.cc
          shuffle(*d);
          shuffle(*(d + 1));
  #endif
-@@ -181,12 +181,12 @@ int BlowFish::decrypt(void *block, int l
+@@ -170,12 +170,12 @@ int BlowFish::decrypt(void *block, int l
      }
  
      for (int i = 0; i < len / _blksz; i++) {


More information about the Neon-commits mailing list