summaryrefslogtreecommitdiff
path: root/usr/src/lib/libc
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2018-12-17 12:54:39 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2018-12-17 12:54:39 +0000
commit4b3d3b0096454cadc8c9c15703aa2dcc9d6675a9 (patch)
tree350cef746dec1ab70f29aa88e39372dd382c9659 /usr/src/lib/libc
parentad624932236bc6528ef8d030ba2d46e3f732e9ee (diff)
parentde6af22ae73ba8d72672288621ff50b88f2cf5fd (diff)
downloadillumos-joyent-4b3d3b0096454cadc8c9c15703aa2dcc9d6675a9.tar.gz
[illumos-gate merge]
commit de6af22ae73ba8d72672288621ff50b88f2cf5fd 9971 Make getrandom(2) a public interface
Diffstat (limited to 'usr/src/lib/libc')
-rw-r--r--usr/src/lib/libc/port/gen/getentropy.c4
-rw-r--r--usr/src/lib/libc/port/mapfile-vers6
-rw-r--r--usr/src/lib/libc/port/sys/getrandom.c6
3 files changed, 10 insertions, 6 deletions
diff --git a/usr/src/lib/libc/port/gen/getentropy.c b/usr/src/lib/libc/port/gen/getentropy.c
index 4392727a95..77aa74a527 100644
--- a/usr/src/lib/libc/port/gen/getentropy.c
+++ b/usr/src/lib/libc/port/gen/getentropy.c
@@ -10,7 +10,7 @@
*/
/*
- * Copyright (c) 2015, Joyent, Inc.
+ * Copyright (c) 2018, Joyent, Inc.
*/
/*
@@ -23,7 +23,7 @@
int
getentropy(void *buf, size_t buflen)
{
- int ret;
+ ssize_t ret;
if (buflen > 256) {
errno = EIO;
diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers
index c2f537f4c9..7bd92a9423 100644
--- a/usr/src/lib/libc/port/mapfile-vers
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -77,6 +77,11 @@ $if _x86 && _ELF64
$add amd64
$endif
+SYMBOL_VERSION ILLUMOS_0.29 {
+ protected:
+ getrandom;
+} ILLUMOS_0.28;
+
SYMBOL_VERSION ILLUMOS_0.28 {
protected:
pthread_attr_getname_np;
@@ -3023,7 +3028,6 @@ $endif
_getfp;
_getgroupsbymember;
_getlogin_r;
- getrandom;
_getsp;
__gettsp;
getvmusage;
diff --git a/usr/src/lib/libc/port/sys/getrandom.c b/usr/src/lib/libc/port/sys/getrandom.c
index 8e59f526a1..612b3e87f4 100644
--- a/usr/src/lib/libc/port/sys/getrandom.c
+++ b/usr/src/lib/libc/port/sys/getrandom.c
@@ -10,15 +10,15 @@
*/
/*
- * Copyright (c) 2015 Joyent, Inc.
+ * Copyright (c) 2018 Joyent, Inc.
*/
#include <sys/types.h>
#include <sys/syscall.h>
#include <sys/random.h>
-int
-getrandom(void *buf, size_t len, int flags)
+ssize_t
+getrandom(void *buf, size_t len, unsigned int flags)
{
return (syscall(SYS_getrandom, buf, len, flags));
}