From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 21 Sep 2019 20:18:12 +0000 (+0100)
Subject: Merge branch '2.4.x'
X-Git-Tag: 2.5.0~1
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/6633f16cd7b339def9ee1a7b10b6c03c4d9855c5

Merge branch '2.4.x'

* 2.4.x:
  Release 2.4.3.
  debian/control: Don't require `valgrind' on `armel'.
  progs/perftest.c: Document the `-n' option for `enc' and `hash'.
  key/key-misc.c: Fix bogus parentheses in macro.
  symm/rijndael-arm64-crypto.S: Fix bogus element-to-GP move.
  symm/chacha.c: Set the correct nonce size for `xchachaNN'.
  symm/idea.c: Fix key-size descriptor.
---

6633f16cd7b339def9ee1a7b10b6c03c4d9855c5
diff --cc debian/control
index 4401de17,8f318664..8871fd45
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,8 +1,8 @@@
  Source: catacomb
  Section: libs
  Priority: extra
- Build-Depends: debhelper (>= 9), python, valgrind, pkg-config,
+ Build-Depends: debhelper (>= 9), python, valgrind [!armel], pkg-config,
 - mlib-dev (>= 2.2.2.1)
 + mlib-dev (>= 2.3.0)
  Maintainer: Mark Wooding <mdw@distorted.org.uk>
  Standards-Version: 3.1.1