diff options
author | Leo <thinkabit.ukim@gmail.com> | 2020-01-29 00:55:59 +0100 |
---|---|---|
committer | Leo <thinkabit.ukim@gmail.com> | 2020-01-29 00:55:59 +0100 |
commit | 1eb911922a7e818a6f314a68c0561bba008e6efd (patch) | |
tree | 9b647e44195a0a0876b40cbf5fa42dca0641179f /main/libgcrypt | |
parent | d420552f02af2ad6a15cf3a70b76bf86b222c07e (diff) | |
download | aports-1eb911922a7e818a6f314a68c0561bba008e6efd.zip |
Remove stale patches in main/
Diffstat (limited to 'main/libgcrypt')
-rw-r--r-- | main/libgcrypt/random-Fix-hang-of-_gcry_rndjent_get_version.patch | 45 |
1 files changed, 0 insertions, 45 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 deleted file mode 100644 index cb2a1c340db..00000000000 --- a/main/libgcrypt/random-Fix-hang-of-_gcry_rndjent_get_version.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 - |