diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/util/crypto/sss_crypto.c | 29 |
2 files changed, 7 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index 85ed2d948..44794b935 100644 --- a/Makefile.am +++ b/Makefile.am @@ -815,6 +815,7 @@ if HAVE_NSS src/util/crypto/nss/nss_nite.c \ src/util/crypto/nss/nss_util.c \ src/util/crypto/sss_crypto.c \ + src/util/atomic_io.c \ $(NULL) SSS_CRYPT_CFLAGS = $(NSS_CFLAGS) SSS_CRYPT_LIBS = $(NSS_LIBS) @@ -836,6 +837,7 @@ else src/util/crypto/libcrypto/crypto_obfuscate.c \ src/util/crypto/libcrypto/crypto_nite.c \ src/util/crypto/sss_crypto.c \ + src/util/atomic_io.c \ $(NULL) SSS_CRYPT_CFLAGS = $(CRYPTO_CFLAGS) SSS_CRYPT_LIBS = $(CRYPTO_LIBS) diff --git a/src/util/crypto/sss_crypto.c b/src/util/crypto/sss_crypto.c index 4c775f3d9..ac90bac07 100644 --- a/src/util/crypto/sss_crypto.c +++ b/src/util/crypto/sss_crypto.c @@ -25,41 +25,22 @@ int generate_csprng_buffer(uint8_t *buf, size_t size) { ssize_t rsize; - ssize_t pos; int ret; int fd; fd = open("/dev/urandom", O_RDONLY); if (fd == -1) return errno; - rsize = 0; - pos = 0; - while (rsize < size) { - rsize = read(fd, buf + pos, size - pos); - switch (rsize) { - case -1: - if (errno == EINTR) continue; - ret = EIO; - goto done; - case 0: - ret = EIO; - goto done; - default: - if (rsize + pos < size - pos) { - pos += rsize; - continue; - } - ret = EIO; - goto done; - } - } - if (rsize != size) { + rsize = sss_atomic_read_s(fd, buf, size); + if (rsize == -1) { + ret = errno; + goto done; + } else if (rsize != size) { ret = EFAULT; goto done; } ret = EOK; - done: close(fd); return ret; |