Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src remove getentropy bits
details: https://anonhg.NetBSD.org/src/rev/e5b1a0b623d9
branches: trunk
changeset: 944192:e5b1a0b623d9
user: nia <nia%NetBSD.org@localhost>
date: Tue Sep 22 21:37:47 2020 +0000
description:
remove getentropy bits
diffstat:
include/unistd.h | 3 +-
lib/libc/gen/Makefile.inc | 4 +-
lib/libc/gen/getentropy.3 | 93 --------------------------------------------
lib/libc/gen/getentropy.c | 64 ------------------------------
lib/libc/include/namespace.h | 3 +-
5 files changed, 4 insertions(+), 163 deletions(-)
diffs (217 lines):
diff -r f62947eb9b62 -r e5b1a0b623d9 include/unistd.h
--- a/include/unistd.h Tue Sep 22 20:23:57 2020 +0000
+++ b/include/unistd.h Tue Sep 22 21:37:47 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.158 2020/05/16 18:31:47 christos Exp $ */
+/* $NetBSD: unistd.h,v 1.159 2020/09/22 21:37:47 nia Exp $ */
/*-
* Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -338,7 +338,6 @@
int fdiscard(int, off_t, off_t);
int fsync_range(int, int, off_t, off_t);
int getdomainname(char *, size_t);
-int getentropy(void *, size_t);
int getgrouplist(const char *, gid_t, gid_t *, int *);
int getgroupmembership(const char *, gid_t, gid_t *, int, int *);
mode_t getmode(const void *, mode_t);
diff -r f62947eb9b62 -r e5b1a0b623d9 lib/libc/gen/Makefile.inc
--- a/lib/libc/gen/Makefile.inc Tue Sep 22 20:23:57 2020 +0000
+++ b/lib/libc/gen/Makefile.inc Tue Sep 22 21:37:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.205 2020/07/05 01:09:48 christos Exp $
+# $NetBSD: Makefile.inc,v 1.206 2020/09/22 21:37:47 nia Exp $
# from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
# gen sources
@@ -60,7 +60,7 @@
fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 fpgetmask.3 \
ftok.3 fts.3 ftw.3 \
getbsize.3 cgetcap.3 getcwd.3 getdevmajor.3 \
- getdomainname.3 getdiskbyname.3 getentropy.3 getfsent.3 \
+ getdomainname.3 getdiskbyname.3 getfsent.3 \
getgrent.3 getgrouplist.3 gethostname.3 getlastlogx.3 getloadavg.3 \
getmntinfo.3 getnetgrent.3 getpagesize.3 getpass.3 \
getprogname.3 getpwent.3 getttyent.3 getusershell.3 glob.3 \
diff -r f62947eb9b62 -r e5b1a0b623d9 lib/libc/gen/getentropy.3
--- a/lib/libc/gen/getentropy.3 Tue Sep 22 20:23:57 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-.\" $NetBSD: getentropy.3,v 1.2 2020/05/07 12:55:06 wiz Exp $ $
-.\"
-.\" Copyright (c) 2020 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Nia Alarie.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd May 1, 2020
-.Dt GETENTROPY 3
-.Os
-.Sh NAME
-.Nm getentropy
-.Nd fill a buffer with high quality random data
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getentropy "void *buf" "size_t buflen"
-.Sh DESCRIPTION
-The
-.Fn getentropy
-function fills a buffer with high quality random data, suitable for seeding
-cryptographically secure pseudo-random number generators.
-.Pp
-.Fn getentropy
-is only intended for seeding random number generators and is not intended
-for use by regular code which simply needs secure random data.
-For this purpose, please use
-.Xr arc4random 3 .
-.Pp
-The maximum value for
-.Li buflen
-is 256 bytes.
-.Sh IMPLEMENTATION NOTES
-.Fn getentropy
-reads from the
-.Xr sysctl 7
-variable
-.Li kern.arandom .
-.Sh RETURN VALUES
-The
-.Fn getentropy
-function returns 0 on success, and \-1 if an error occurred.
-.Sh ERRORS
-.Fn getentropy
-will succeed unless:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa buf
-argument points to an invalid memory address.
-.It Bq Er EIO
-Too many bytes were requested.
-.El
-.Sh SEE ALSO
-.Xr arc4random 3 ,
-.Xr rnd 4
-.Sh STANDARDS
-The
-.Fn getentropy
-function is non-standard.
-.Sh HISTORY
-The
-.Fn getentropy
-function first appeared in
-.Ox 5.6 ,
-then in
-.Fx 12.0 ,
-and
-.Nx 10 .
diff -r f62947eb9b62 -r e5b1a0b623d9 lib/libc/gen/getentropy.c
--- a/lib/libc/gen/getentropy.c Tue Sep 22 20:23:57 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/* $NetBSD: getentropy.c,v 1.1 2020/05/06 16:17:36 nia Exp $ */
-
-/*-
- * Copyright (c) 2020 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nia Alarie.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: getentropy.c,v 1.1 2020/05/06 16:17:36 nia Exp $");
-
-#include "namespace.h"
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-#ifdef __weak_alias
-__weak_alias(getentropy,_getentropy)
-#endif
-
-int
-getentropy(void *buf, size_t buflen)
-{
- size_t len = buflen;
- int name[2] = { CTL_KERN, KERN_ARND };
-
- if (buf == NULL && buflen > 0) {
- errno = EFAULT;
- return -1;
- }
-
- if (buflen > 256) {
- errno = EIO;
- return -1;
- }
-
- return sysctl(name, 2, buf, &len, NULL, 0);
-}
diff -r f62947eb9b62 -r e5b1a0b623d9 lib/libc/include/namespace.h
--- a/lib/libc/include/namespace.h Tue Sep 22 20:23:57 2020 +0000
+++ b/lib/libc/include/namespace.h Tue Sep 22 21:37:47 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.199 2020/05/06 16:17:36 nia Exp $ */
+/* $NetBSD: namespace.h,v 1.200 2020/09/22 21:38:50 nia Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -362,7 +362,6 @@
#define getdevmajor _getdevmajor
#define getdiskbyname _getdiskbyname
#define getdomainname _getdomainname
-#define getentropy _getentropy
#define getfsent _getfsent
#define getfsfile _getfsfile
#define getfsspec _getfsspec
Home |
Main Index |
Thread Index |
Old Index