--- xnu/xnu-1228.3.13/bsd/dev/random/randomdev.c
+++ xnu/xnu-1228/bsd/dev/random/randomdev.c
@@ -99,7 +99,7 @@
 
 void add_blocks(Block a, Block b, BlockWord carry);
 void fips_initialize(void);
-void random_block(Block b, int addOptional);
+void random_block(Block b);
 u_int32_t CalculateCRC(u_int8_t* buffer, size_t length);
 
 /*
@@ -194,22 +194,18 @@
  * get a random block of data per fips 186-2
  */
 void
-random_block(Block b, int addOptional)
+random_block(Block b)
 {
 	int repeatCount = 0;
 	do
 	{
 		// do one iteration
-		
-		if (addOptional)
-		{
-			Block xSeed;
-			prngOutput (gPrngRef, (BYTE*) &xSeed, sizeof (xSeed));
-			
-			// add the seed to the previous value of g_xkey
-			add_blocks (g_xkey, xSeed, 0);
-		}
-		
+		Block xSeed;
+		prngOutput (gPrngRef, (BYTE*) &xSeed, sizeof (xSeed));
+		
+		// add the seed to the previous value of g_xkey
+		add_blocks (g_xkey, xSeed, 0);
+
 		// compute "G"
 		SHA1Update (&g_sha1_ctx, (const u_int8_t *) &g_xkey, sizeof (g_xkey));
 		
@@ -313,13 +309,11 @@
 	fips_initialize ();
 }
 
-const Block kKnownAnswer = {0x92b404e5, 0x56588ced, 0x6c1acd4e, 0xbf053f68, 0x9f73a93};
-
 void
 fips_initialize(void)
 {
-	/* So that we can do the self test, set the seed to zero */
-	memset(&g_xkey, 0, sizeof(g_xkey));
+	/* Read the initial value of g_xkey from yarrow */
+	prngOutput (gPrngRef, (BYTE*) &g_xkey, sizeof (g_xkey));
 	
 	/* initialize our SHA1 generator */
 	SHA1Init (&g_sha1_ctx);
@@ -327,20 +321,7 @@
 	/* other initializations */
 	memset (zeros, 0, sizeof (zeros));
 	g_bytes_used = 0;
-	random_block(g_random_data, FALSE);
-	
-	// check here to see if we got the initial data we were expecting
-	int i;
-	for (i = 0; i < kBSize; ++i)
-	{
-		if (kKnownAnswer[i] != g_random_data[i])
-		{
-			panic("FIPS random self test failed");
-		}
-	}
-	
-	// now do the random block again to make sure that userland doesn't get predicatable data
-	random_block(g_random_data, TRUE);
+	random_block(g_random_data);
 }
 
 /*
@@ -509,7 +490,7 @@
 		int bytes_available = kBSizeInBytes - g_bytes_used;
         if (bytes_available == 0)
 		{
-			random_block(g_random_data, TRUE);
+			random_block(g_random_data);
 			g_bytes_used = 0;
 			bytes_available = kBSizeInBytes;
 		}
@@ -552,7 +533,7 @@
         int bytes_to_read = min(bytes_remaining, kBSizeInBytes - g_bytes_used);
         if (bytes_to_read == 0)
 		{
-			random_block(g_random_data, TRUE);
+			random_block(g_random_data);
 			g_bytes_used = 0;
 			bytes_to_read = min(bytes_remaining, kBSizeInBytes);
 		}