diff -Nru psi-plus-1.4.554/debian/changelog psi-plus-1.4.554/debian/changelog --- psi-plus-1.4.554/debian/changelog 2019-09-25 13:12:03.000000000 +0000 +++ psi-plus-1.4.554/debian/changelog 2020-02-26 00:49:21.000000000 +0000 @@ -1,8 +1,9 @@ -psi-plus (1.4.554-3ubuntu1) eoan; urgency=medium +psi-plus (1.4.554-4) unstable; urgency=medium - * Do not hard fail on dh_dwz failures + * Add patch change-omemo-initialization-vector-length: + See: https://github.com/xsf/xeps/pull/894 - -- Gianfranco Costamagna Wed, 25 Sep 2019 15:12:03 +0200 + -- Boris Pek Wed, 26 Feb 2020 03:49:21 +0300 psi-plus (1.4.554-3) unstable; urgency=medium diff -Nru psi-plus-1.4.554/debian/patches/change-omemo-initialization-vector-length.patch psi-plus-1.4.554/debian/patches/change-omemo-initialization-vector-length.patch --- psi-plus-1.4.554/debian/patches/change-omemo-initialization-vector-length.patch 1970-01-01 00:00:00.000000000 +0000 +++ psi-plus-1.4.554/debian/patches/change-omemo-initialization-vector-length.patch 2020-02-26 00:49:20.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Change OMEMO Initialization Vector length to 12 + See: https://github.com/xsf/xeps/pull/894 +Last-Update: 2020-02-26 +Origin: upstream, https://github.com/psi-im/plugins/commit/d39789cb +Bug: https://github.com/psi-im/plugins/issues/61 + + +--- a/src/plugins/generic/omemoplugin/src/crypto.h ++++ b/src/plugins/generic/omemoplugin/src/crypto.h +@@ -28,7 +28,7 @@ + }; + + #define OMEMO_AES_128_KEY_LENGTH 16 +-#define OMEMO_AES_GCM_IV_LENGTH 16 ++#define OMEMO_AES_GCM_IV_LENGTH 12 + #define OMEMO_AES_GCM_TAG_LENGTH 16 + + namespace psiomemo { diff -Nru psi-plus-1.4.554/debian/patches/series psi-plus-1.4.554/debian/patches/series --- psi-plus-1.4.554/debian/patches/series 2019-07-23 23:46:25.000000000 +0000 +++ psi-plus-1.4.554/debian/patches/series 2020-02-26 00:49:20.000000000 +0000 @@ -1,3 +1,4 @@ disable-usage-of-system-proxies.patch fix-autoscroll-in-chats.patch send-unavailable-presence-on-program-exit.patch +change-omemo-initialization-vector-length.patch diff -Nru psi-plus-1.4.554/debian/rules psi-plus-1.4.554/debian/rules --- psi-plus-1.4.554/debian/rules 2019-09-25 13:12:02.000000000 +0000 +++ psi-plus-1.4.554/debian/rules 2020-02-26 00:49:20.000000000 +0000 @@ -27,9 +27,6 @@ %: dh $@ --buildsystem=cmake -override_dh_dwz: - dh_dwz || true - override_dh_auto_configure: dh_auto_configure -B$(BUILDDIR1) -- $(CMAKEOPTS) $(OPTSSTEP1) dh_auto_configure -B$(BUILDDIR2) -- $(CMAKEOPTS) $(OPTSSTEP2)