rpm/libgcrypt
SHA256
1
0
Fork 0
forked from pool/libgcrypt
Code Pull Requests Activity

- fix bnc#856915: can't open /dev/urandom

Browse Source 
* correct libgcrypt-1.5.0-etc_gcrypt_rngseed-symlink.diff

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=36
This commit is contained in:
Michal Vyskocil 2014-01-03 09:44:43 +00:00 committed by Git OBS Bridge
parent fd1be62577
commit 2dd2695b1b
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libgcrypt-1.5.0-etc_gcrypt_rngseed-symlink.diff
View File

@ -10,10 +10,10 @@ References: bnc#724841
https://bugzilla.novell.com/show_bug.cgi?id=724841 https://bugzilla.novell.com/show_bug.cgi?id=724841
--- ---
random/random-csprng.c | 2 +- random/random-csprng.c | 2 -
random/random-fips.c | 10 +++++----- random/random-fips.c | 10 ++++----
random/rndlinux.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ random/rndlinux.c | 58 ++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 48 insertions(+), 12 deletions(-) 3 files changed, 54 insertions(+), 16 deletions(-)
Index: libgcrypt-1.6.0/random/random-csprng.c Index: libgcrypt-1.6.0/random/random-csprng.c
=================================================================== ===================================================================
@ -79,21 +79,37 @@ Index: libgcrypt-1.6.0/random/rndlinux.c
{ {
int fd; int fd;
@@ -77,8 +78,11 @@ open_device (const char *name, int retry @@ -67,8 +68,9 @@ open_device (const char *name, int retry
_gcry_random_progress ("open_dev_random", 'X', 1, 0);
again:
fd = open (name, O_RDONLY);
- if (fd == -1 && retry)
- {
+ if (fd == -1) {
+ if (retry)
+ {
struct timeval tv;
tv.tv_sec = 5;
@@ -76,9 +78,14 @@ open_device (const char *name, int retry
_gcry_random_progress ("wait_dev_random", 'X', 0, (int)tv.tv_sec);
select (0, NULL, NULL, NULL, &tv); select (0, NULL, NULL, NULL, &tv);
goto again; goto again;
} - }
- if (fd == -1) - if (fd == -1)
- log_fatal ("can't open %s: %s\n", name, strerror(errno) ); - log_fatal ("can't open %s: %s\n", name, strerror(errno) );
+ }
+ else
+ { + {
+ if (fatal) + if (fatal)
+ log_fatal ("can't open %s: %s\n", name, strerror(errno) ); + log_fatal ("can't open %s: %s\n", name, strerror(errno) );
+ return fd; + return fd;
+ }
+ } + }
if (set_cloexec_flag (fd)) if (set_cloexec_flag (fd))
log_error ("error setting FD_CLOEXEC on fd %d: %s\n", log_error ("error setting FD_CLOEXEC on fd %d: %s\n",
@@ -111,11 +115,13 @@ _gcry_rndlinux_gather_random (void (*add @@ -111,11 +118,13 @@ _gcry_rndlinux_gather_random (void (*add
{ {
static int fd_urandom = -1; static int fd_urandom = -1;
static int fd_random = -1; static int fd_random = -1;
@ -107,7 +123,7 @@ Index: libgcrypt-1.6.0/random/rndlinux.c
size_t want = length; size_t want = length;
size_t last_so_far = 0; size_t last_so_far = 0;
int any_need_entropy = 0; int any_need_entropy = 0;
@@ -153,20 +159,46 @@ _gcry_rndlinux_gather_random (void (*add @@ -153,20 +162,46 @@ _gcry_rndlinux_gather_random (void (*add
that we always require the device to be existent but want a more that we always require the device to be existent but want a more
graceful behaviour if the rarely needed close operation has been graceful behaviour if the rarely needed close operation has been
used and the device needs to be re-opened later. */ used and the device needs to be re-opened later. */
@ -157,7 +173,7 @@ Index: libgcrypt-1.6.0/random/rndlinux.c
ever_opened |= 2; ever_opened |= 2;
} }
fd = fd_urandom; fd = fd_urandom;
@@ -242,6 +274,9 @@ _gcry_rndlinux_gather_random (void (*add @@ -242,6 +277,9 @@ _gcry_rndlinux_gather_random (void (*add
} }
memset(buffer, 0, sizeof(buffer) ); memset(buffer, 0, sizeof(buffer) );

6
libgcrypt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 3 09:43:39 UTC 2014 - mvyskocil@suse.com
- fix bnc#856915: can't open /dev/urandom
* correct libgcrypt-1.5.0-etc_gcrypt_rngseed-symlink.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 19 13:53:21 UTC 2013 - mvyskocil@suse.com Thu Dec 19 13:53:21 UTC 2013 - mvyskocil@suse.com

2
libgcrypt.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libgcrypt # spec file for package libgcrypt
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed