/*
- * Copyright (c) 1999, 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2004 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
#include <kern/lock.h>
#include <sys/time.h>
#include <sys/malloc.h>
+#include <sys/uio_internal.h>
#include <dev/random/randomdev.h>
#include <dev/random/YarrowCoreLib/include/yarrow.h>
#define RANDOM_MAJOR -1 /* let the kernel pick the device number */
+d_ioctl_t random_ioctl;
+
/*
* A struct describing which functions will get invoked for certain
* actions.
random_close, /* close */
random_read, /* read */
random_write, /* write */
- eno_ioctl, /* ioctl */
- nulldev, /* stop */
- nulldev, /* reset */
+ random_ioctl, /* ioctl */
+ (stop_fcn_t *)nulldev, /* stop */
+ (reset_fcn_t *)nulldev, /* reset */
NULL, /* tty's */
eno_select, /* select */
eno_mmap, /* mmap */
#define RESEED_TICKS 50 /* how long a reseed operation can take */
+
/*
*Initialize ONLY the Yarrow generator.
*/
-void PreliminarySetup ()
+void PreliminarySetup( void )
{
prng_error_status perr;
struct timeval tt;
* and to register ourselves with devfs
*/
void
-random_init()
+random_init( void )
{
int ret;
}
devfs_make_node(makedev (ret, 0), DEVFS_CHAR,
- UID_ROOT, GID_WHEEL, 0644, "random", 0);
+ UID_ROOT, GID_WHEEL, 0666, "random", 0);
/*
* also make urandom
* (which is exactly the same thing in our context)
*/
devfs_make_node(makedev (ret, 1), DEVFS_CHAR,
- UID_ROOT, GID_WHEEL, 0644, "urandom", 0);
+ UID_ROOT, GID_WHEEL, 0666, "urandom", 0);
+}
+
+int
+random_ioctl( __unused dev_t dev, u_long cmd, __unused caddr_t data,
+ __unused int flag, __unused struct proc *p )
+{
+ switch (cmd) {
+ case FIONBIO:
+ case FIOASYNC:
+ break;
+ default:
+ return ENODEV;
+ }
+
+ return (0);
}
/*
*/
int
-random_open(dev_t dev, int flags, int devtype, struct proc *p)
+random_open(__unused dev_t dev, int flags, __unused int devtype, __unused struct proc *p)
{
if (gRandomError != 0) {
/* forget it, yarrow didn't come up */
if (flags & FWRITE) {
if (securelevel >= 2)
return (EPERM);
- if ((securelevel >= 1) && suser(p->p_ucred, &p->p_acflag))
+#ifndef __APPLE__
+ if ((securelevel >= 1) && proc_suser(p))
return (EPERM);
+#endif /* !__APPLE__ */
}
return (0);
*/
int
-random_close(dev_t dev, int flags, int mode, struct proc *p)
+random_close(__unused dev_t dev, __unused int flags, __unused int mode, __unused struct proc *p)
{
return (0);
}
* prng.
*/
int
-random_write (dev_t dev, struct uio *uio, int ioflag)
+random_write (__unused dev_t dev, struct uio *uio, __unused int ioflag)
{
int retCode = 0;
char rdBuffer[256];
/* Security server is sending us entropy */
- while (uio->uio_resid > 0 && retCode == 0) {
+ while (uio_resid(uio) > 0 && retCode == 0) {
/* get the user's data */
- int bytesToInput = min(uio->uio_resid, sizeof (rdBuffer));
+ // LP64todo - fix this! uio_resid may be 64-bit value
+ int bytesToInput = min(uio_resid(uio), sizeof (rdBuffer));
retCode = uiomove(rdBuffer, bytesToInput, uio);
if (retCode != 0)
goto /*ugh*/ error_exit;
* return data to the caller. Results unpredictable.
*/
int
-random_read(dev_t dev, struct uio *uio, int ioflag)
+random_read(__unused dev_t dev, struct uio *uio, __unused int ioflag)
{
int retCode = 0;
char wrBuffer[512];
/* lock down the mutex */
mutex_lock(gYarrowMutex);
- while (uio->uio_resid > 0 && retCode == 0) {
+ while (uio_resid(uio) > 0 && retCode == 0) {
/* get the user's data */
- int bytesToRead = min(uio->uio_resid, sizeof (wrBuffer));
+ // LP64todo - fix this! uio_resid may be 64-bit value
+ int bytesToRead = min(uio_resid(uio), sizeof (wrBuffer));
/* get the data from Yarrow */
if (prngOutput(gPrngRef, (BYTE *) wrBuffer, sizeof (wrBuffer)) != 0) {
* Return an unsigned long pseudo-random number.
*/
u_long
-RandomULong()
+RandomULong( void )
{
u_long buf;
read_random(&buf, sizeof (buf));
projects / apple / xnu.git / blobdiff