From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 14 May 2017 03:11:09 +0000 (+0100)
Subject: Merge branch '2.3.x'
X-Git-Tag: 2.4.0~37
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/373641eaacc86b56715a2ebf0b603fce25c16051

Merge branch '2.3.x'

* 2.3.x:
  Release 2.3.1.
  pub/bbs-gen.c, pub/rsa-gen.c: Remove the lower-bounding on q.
  math/strongprime.c: Clamp the starting point.
  math/strongprime.c: Reduce failures by adding some more slop bits.
  progs/catcrypt.c, progs/cc-sig.c: Compare MAC tags in constant time.
  progs/cc-sig.c: Initialize hash context properly for RSA-PSS.
  progs/cc-sig.c: Don't destroy an RSA context just after building it.
  math/g-bin.c, math/g-prime.c: Fix type incompatibility.
  math/g-*.c: Group implementations include `group.h' via `group-guts.h'.
  key/key-io.c: Produce valid key lines for empty keys.
  key/key-io.c: Fix segfault opening `KOPEN_READ | KOPEN_NOFILE' key files.

Conflicts:
	math/group-guts.h (trivial)
	progs/catcrypt.c (already picked up)
---

373641eaacc86b56715a2ebf0b603fce25c16051