diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-08-25 17:22:56 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-08-25 17:22:56 +0000 |
| commit | 7243349028a2296c5ac63fa985dd4b9f4aca9d9a (patch) | |
| tree | a1cfbafa193bf1a02c5539c01b64595157e0cbee | |
| parent | strlcpy() accesses the source string until it finds NUL, even if (diff) | |
| download | wireguard-openbsd-7243349028a2296c5ac63fa985dd4b9f4aca9d9a.tar.xz wireguard-openbsd-7243349028a2296c5ac63fa985dd4b9f4aca9d9a.zip | |
KNF
| -rw-r--r-- | lib/libcrypto/arc4random/getentropy_freebsd.c | 10 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_freebsd.c | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/lib/libcrypto/arc4random/getentropy_freebsd.c b/lib/libcrypto/arc4random/getentropy_freebsd.c index ec760ae43dc..d5371b55787 100644 --- a/lib/libcrypto/arc4random/getentropy_freebsd.c +++ b/lib/libcrypto/arc4random/getentropy_freebsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_freebsd.c,v 1.1 2014/11/03 06:23:30 bcook Exp $ */ +/* $OpenBSD: getentropy_freebsd.c,v 1.2 2015/08/25 17:22:56 deraadt Exp $ */ /* * Copyright (c) 2014 Pawel Jakub Dawidek <pjd@FreeBSD.org> @@ -54,11 +54,9 @@ getentropy_sysctl(u_char *buf, size_t size) int getentropy(void *buf, size_t len) { - if (len <= 256 && - getentropy_sysctl(buf, len) == len) { - return 0; - } + if (len <= 256 && getentropy_sysctl(buf, len) == len) + return (0); errno = EIO; - return -1; + return (-1); } diff --git a/lib/libcrypto/crypto/getentropy_freebsd.c b/lib/libcrypto/crypto/getentropy_freebsd.c index ec760ae43dc..d5371b55787 100644 --- a/lib/libcrypto/crypto/getentropy_freebsd.c +++ b/lib/libcrypto/crypto/getentropy_freebsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_freebsd.c,v 1.1 2014/11/03 06:23:30 bcook Exp $ */ +/* $OpenBSD: getentropy_freebsd.c,v 1.2 2015/08/25 17:22:56 deraadt Exp $ */ /* * Copyright (c) 2014 Pawel Jakub Dawidek <pjd@FreeBSD.org> @@ -54,11 +54,9 @@ getentropy_sysctl(u_char *buf, size_t size) int getentropy(void *buf, size_t len) { - if (len <= 256 && - getentropy_sysctl(buf, len) == len) { - return 0; - } + if (len <= 256 && getentropy_sysctl(buf, len) == len) + return (0); errno = EIO; - return -1; + return (-1); } |