xnu-1504.9.26.tar.gz

[apple/xnu.git] / bsd / dev / random / randomdev.c

diff --git a/bsd/dev/random/randomdev.c b/bsd/dev/random/randomdev.c
index ab9312f976fe479ee0531a17ab6f11739bcd2989..c081bd20904ca64b7dc49b091f1cb734eac98ad6 100644 (file)
--- a/bsd/dev/random/randomdev.c
+++ b/bsd/dev/random/randomdev.c
@@ -88,6 +88,18 @@ static struct cdevsw random_cdevsw =
        0                                       /* type */
 };
 
        0                                       /* type */
 };
 

+
+/*
+       WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING!
+
+       ANY CODE PROTECTED UNDER "#ifdef __arm__" IS SERIOUSLY SUPPOSED TO BE THERE!
+       IF YOU REMOVE ARM CODE, RANDOM WILL NOT MEAN ANYTHING FOR iPHONES ALL OVER.
+       PLEASE DON'T TOUCH __arm__ CODE IN THIS FILE!
+
+       WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING!
+*/
+
+

 /* Used to detect whether we've already been initialized */
 static int gRandomInstalled = 0;
 static PrngRef gPrngRef;
 /* Used to detect whether we've already been initialized */
 static int gRandomInstalled = 0;
 static PrngRef gPrngRef;


@@ -517,6 +529,7 @@ random_read(__unused dev_t dev, struct uio *uio, __unused int ioflag)
    /* lock down the mutex */
     lck_mtx_lock(gYarrowMutex);
 
    /* lock down the mutex */
     lck_mtx_lock(gYarrowMutex);
 

+

        int bytes_remaining = uio_resid(uio);
     while (bytes_remaining > 0 && retCode == 0) {
         /* get the user's data */
        int bytes_remaining = uio_resid(uio);
     while (bytes_remaining > 0 && retCode == 0) {
         /* get the user's data */


@@ -557,7 +570,6 @@ read_random(void* buffer, u_int numbytes)
     }
     
     lck_mtx_lock(gYarrowMutex);
     }
     
     lck_mtx_lock(gYarrowMutex);

-

        int bytes_read = 0;
 
        int bytes_remaining = numbytes;
        int bytes_read = 0;
 
        int bytes_remaining = numbytes;


@@ -589,3 +601,4 @@ RandomULong(void)
        read_random(&buf, sizeof (buf));
        return (buf);
 }
        read_random(&buf, sizeof (buf));
        return (buf);
 }

+