src/libgcrypt-config.in | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 drop -lgpg-error from libgcrypt-config --libs output.

src/libgcrypt-config.in | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 do not print standard multiarch path
 {/usr,}/lib/i386-linux-gnu are in the standard search path, there is no
 need to explicitly point gcc there with a -L argument.

configure.ac | 8 5 + 3 - 0 !
1 file changed, 5 insertions(+), 3 deletions(-)

 do not pull revision info from git
 Stop trying to pull version info from GIT when autoconf is run.

doc/gcrypt.texi | 16 10 + 6 - 0 !
1 file changed, 10 insertions(+), 6 deletions(-)

 [patch] doc: fix library initialization examples

Signed-off-by: Andreas Metzler <ametzler@bebt.de>

cipher/elgamal.c | 24 6 + 18 - 0 !
1 file changed, 6 insertions(+), 18 deletions(-)

 [patch] cipher: fix elgamal encryption for other implementations.

* cipher/elgamal.c (gen_k): Remove support of smaller K.
(do_encrypt): Never use smaller K.
(sign): Folllow the change of gen_k.

--

Cherry-pick master commit of:
	632d80ef30e13de6926d503aa697f92b5dbfbc5e

This change basically reverts encryption changes in two commits:

	74386120dad6b3da62db37f7044267c8ef34689b
	78531373a342aeb847950f404343a05e36022065

Use of smaller K for ephemeral key in ElGamal encryption is only good,
when we can guarantee that recipient's key is generated by our
implementation (or compatible).

For detail, please see:

    Luca De Feo, Bertram Poettering, Alessandro Sorniotti,
    "On the (in)security of ElGamal in OpenPGP";
    in the proceedings of  CCS'2021.

CVE-id: CVE-2021-33560
GnuPG-bug-id: 5328
Suggested-by: Luca De Feo, Bertram Poettering, Alessandro Sorniotti
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>