diff options
Diffstat (limited to 'helper.c')
-rw-r--r-- | helper.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -100,8 +100,7 @@ void get_random_bytes(unsigned char *buf, int len) | |||
100 | if (sizeof(RANDOM_POOL) > sizeof(addr.sun_path)) | 100 | if (sizeof(RANDOM_POOL) > sizeof(addr.sun_path)) |
101 | fatal("Random pool path is too long"); | 101 | fatal("Random pool path is too long"); |
102 | 102 | ||
103 | strncpy(addr.sun_path, RANDOM_POOL, sizeof(addr.sun_path - 1)); | 103 | strcpy(addr.sun_path, RANDOM_POOL); |
104 | addr.sun_path[sizeof(addr.sun_path - 1)] = '\0'; | ||
105 | 104 | ||
106 | addr_len = offsetof(struct sockaddr_un, sun_path) + sizeof(RANDOM_POOL); | 105 | addr_len = offsetof(struct sockaddr_un, sun_path) + sizeof(RANDOM_POOL); |
107 | 106 | ||
@@ -130,9 +129,12 @@ void get_random_bytes(unsigned char *buf, int len) | |||
130 | 129 | ||
131 | #endif /* HAVE_EGD */ | 130 | #endif /* HAVE_EGD */ |
132 | 131 | ||
133 | c = read(random_pool, buf, len); | 132 | do { |
134 | if (c == -1) | 133 | c = read(random_pool, buf, len); |
135 | fatal("Couldn't read from random pool \"%s\": %s", RANDOM_POOL, strerror(errno)); | 134 | |
135 | if ((c == -1) && (errno != EINTR)) | ||
136 | fatal("Couldn't read from random pool \"%s\": %s", RANDOM_POOL, strerror(errno)); | ||
137 | } while (c == -1); | ||
136 | 138 | ||
137 | if (c != len) | 139 | if (c != len) |
138 | fatal("Short read from random pool \"%s\"", RANDOM_POOL); | 140 | fatal("Short read from random pool \"%s\"", RANDOM_POOL); |