oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Revert "tommath: Fix warning in s_read_getrandom()"

Browse Source 
This reverts commit 489da75e65.

Will be replaced with upstream commit.
This commit is contained in:
Luke Howard
2022-01-15 13:37:25 +11:00
parent f076ed57cc
commit 046675ce0e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hcrypto/libtommath/bn_s_mp_rand_platform.c
View File

@@ -56,16 +56,16 @@ static mp_err s_read_wincsp(void *p, size_t n)
static mp_err s_read_getrandom(void *p, size_t n) static mp_err s_read_getrandom(void *p, size_t n)
{ {
char *r = (char *)p; char *q = (char *)p;
while (n > 0u) { while (n > 0u) {
ssize_t ret = getrandom(r, n, 0); ssize_t ret = getrandom(q, n, 0);
if (ret < 0) { if (ret < 0) {
if (errno == EINTR) { if (errno == EINTR) {
continue; continue;
} }
return MP_ERR; return MP_ERR;
} }
r += ret; q += ret;
n -= (size_t)ret; n -= (size_t)ret;
} }
return MP_OKAY; return MP_OKAY;
@@ -88,7 +88,7 @@ static mp_err s_read_getrandom(void *p, size_t n)
static mp_err s_read_urandom(void *p, size_t n) static mp_err s_read_urandom(void *p, size_t n)
{ {
int fd; int fd;
char *r = (char *)p; char *q = (char *)p;
do { do {
fd = open(MP_DEV_URANDOM, O_RDONLY); fd = open(MP_DEV_URANDOM, O_RDONLY);
@@ -96,7 +96,7 @@ static mp_err s_read_urandom(void *p, size_t n)
if (fd == -1) return MP_ERR; if (fd == -1) return MP_ERR;
while (n > 0u) { while (n > 0u) {
ssize_t ret = read(fd, r, n); ssize_t ret = read(fd, p, n);
if (ret < 0) { if (ret < 0) {
if (errno == EINTR) { if (errno == EINTR) {
continue; continue;
@@ -104,7 +104,7 @@ static mp_err s_read_urandom(void *p, size_t n)
close(fd); close(fd);
return MP_ERR; return MP_ERR;
} }
r += ret; q += ret;
n -= (size_t)ret; n -= (size_t)ret;
} }