main/libgcrypt: security upgrade to 1.8.3

fixes #9003

1 files changed, 45 insertions, 0 deletions

diff --git a/main/libgcrypt/random-Fix-hang-of-_gcry_rndjent_get_version.patch b/main/libgcrypt/random-Fix-hang-of-_gcry_rndjent_get_version.patch
new file mode 100644
index 0000000000..cb2a1c340d
--- /dev/null
+++ b/main/libgcrypt/random-Fix-hang-of-_gcry_rndjent_get_version.patch
@@ -0,0 +1,45 @@
+From 355f5b7f69075c010fe33aa5b10ac60c08fae0c7 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Sun, 17 Jun 2018 18:53:58 -0500
+Subject: [PATCH] random: Fix hang of _gcry_rndjent_get_version.
+
+* random/rndjent.c (_gcry_rndjent_get_version): Move locking.
+
+--
+
+While the protection for jent_rng_collector is needed,
+_gcry_rndjent_poll is also acquiring the lock for the variable.
+Thus, it hangs.
+
+This change is sub-optimal, the lock is once released after the call
+of _gcry_rndjent_poll.  It might be good to modify the API of
+_gcry_rndjent_poll to explicitly allow this use case of forcing
+initialization keeping the lock.
+
+Comments and change log entry by gniibe.
+
+GnuPG-bug-id: 4034
+Fixes-commit: 0de2a22fcf6607d0aecb550feefa414cee3731b2
+---
+ random/rndjent.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/random/rndjent.c b/random/rndjent.c
+index 0c5a820..3740ddd 100644
+--- a/random/rndjent.c
++++ b/random/rndjent.c
+@@ -334,9 +334,10 @@ _gcry_rndjent_get_version (int *r_active)
+     {
+       if (r_active)
+         {
+-          lock_rng ();
+           /* Make sure the RNG is initialized.  */
+           _gcry_rndjent_poll (NULL, 0, 0);
++
++          lock_rng ();
+           /* To ease debugging we store 2 for a clock_gettime based
+            * implementation and 1 for a rdtsc based code.  */
+           *r_active = jent_rng_collector? is_rng_available () : 0;
+-- 
+2.8.0.rc3
+