[[feature-random]] engine: Use libfoundation random data API.

peter-b · peter-b · commit d02a2e32dab1 · 2015-01-16T13:14:43.000Z
Change all in-kernel consumers of random numbers to use
MCDataCreateRandom().
diff --git a/engine/Makefile.kernel b/engine/Makefile.kernel
@@ -55,7 +55,7 @@ SOURCES=\
 	menuparse.cpp parentscript.cpp securemode.cpp \
 	bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
 	externalv0.cpp externalv1.cpp uuid.cpp \
-	sysspec.cpp dsklnx.cpp dskspec.cpp sysunxdate.cpp sysunxnetwork.cpp sysunxrandom.cpp \
+	sysspec.cpp dsklnx.cpp dskspec.cpp sysunxdate.cpp sysunxnetwork.cpp \
 	lnxpasteboard.cpp lnxtransfer.cpp lnxclipboard.cpp \
 	lnxdc.cpp lnxdce.cpp lnxdcs.cpp lnxdclnx.cpp lnxflst.cpp lnxflstold.cpp \
 	lnxstack.cpp lnxans.cpp \
diff --git a/engine/src/exec-security.cpp b/engine/src/exec-security.cpp
@@ -83,7 +83,7 @@ void MCSecurityEvalRandomBytes(MCExecContext& ctxt, uinteger_t p_byte_count, MCD
 		return;
 	}
 
-	if (MCU_random_bytes(p_byte_count, r_bytes))
+	if (MCDataCreateRandom (p_byte_count, r_bytes))
 	{
 		ctxt.SetTheResultToEmpty();
 		return;
diff --git a/engine/src/funcs.cpp b/engine/src/funcs.cpp
@@ -6986,40 +6986,6 @@ char *MCHTTPProxyForURL::PACmyIpAddress(const char* const* p_arguments, unsigned
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef /* MCRandomBytes */ LEGACY_EXEC
-	if (byte_count->eval(ep) != ES_NORMAL && ep.ton() != ES_NORMAL)
-	{
-		MCeerror->add(EE_RANDOMBYTES_BADCOUNT, line, pos);
-		return ES_ERROR;
-	}
-	
-	size_t t_count;
-	t_count = ep.getuint4();
-	
-	// MW-2013-05-21: [[ RandomBytes ]] Updated to use system primitive, rather
-	//   than SSL.
-	
-	void *t_bytes;
-	t_bytes = ep . getbuffer(t_count);
-	if (t_bytes == nil)
-	{
-		MCeerror -> add(EE_NO_MEMORY, line, pos);
-		return ES_ERROR;
-	}
-	
-	if (MCU_random_bytes(t_count, t_bytes))
-		ep . setlength(t_count);
-	else
-	{
-		ep . clear();
-		MCresult->copysvalue(MCString("error: could not get random bytes"));
-	}
-	
-	return ES_NORMAL;
-#endif /* MCRandomBytes */
-
-///////////////////////////////////////////////////////////////////////////////
-
 MCControlAtLoc::~MCControlAtLoc()
 {
     delete location;
diff --git a/engine/src/mbliphone.mm b/engine/src/mbliphone.mm
@@ -1163,18 +1163,6 @@ virtual int64_t GetFileSize(void)
 
 //////////////////
 
-// MW-2013-05-21: [[ RandomBytes ]] System function for random bytes on iOS.
-bool MCS_random_bytes(size_t p_count, MCDataRef& r_buffer)
-{
-    // IM-2014-04-16: [[ Bug 11860 ]] SecRandomCopyBytes returns 0 on success
-    MCAutoByteArray t_bytes;
-    return (t_bytes . New(p_count) &&
-            SecRandomCopyBytes(kSecRandomDefault, p_count, (uint8_t *)t_bytes . Bytes()) == 0 &&
-            t_bytes . CreateData(r_buffer));
-}
-
-//////////////////
-
 extern "C" void *IOS_LoadModule(const char *name);
 extern "C" void *IOS_ResolveSymbol(void *module, const char *name);
 
diff --git a/engine/src/osspec.h b/engine/src/osspec.h
@@ -182,11 +182,6 @@ void MCS_posttourl(MCObject *p_target, MCDataRef p_data, MCStringRef p_url);
 void MCS_putintourl(MCObject *p_target, MCDataRef p_data, MCStringRef p_url);
 void MCS_geturl(MCObject *p_target, MCStringRef p_url);
 
-// MW-2013-05-21: [[ RandomBytes ]] Attempt to generate a sequence of random
-//   bytes into the provided buffer. The function returns 'false' if there isnt
-//   enough entropy available to generate them.
-bool MCS_random_bytes(size_t p_count, MCDataRef& r_buffer);
-
 extern uint2 MCS_getplayloudness();
 extern void MCS_setplayloudness(uint2 p_loudness);
 
diff --git a/engine/src/srvsession.cpp b/engine/src/srvsession.cpp
@@ -696,9 +696,7 @@ bool MCSessionGenerateID(MCStringRef &r_id)
 	
 	MCAutoDataRef t_randombytes;
     
-    // MW-2013-05-21; [[ RandomBytes ]] Use system primitive rather than SSL
-	//   directly.
-	/* UNCHECKED */ MCU_random_bytes(64, &t_randombytes);
+	/* UNCHECKED */ MCDataCreateRandom (64, &t_randombytes);
 	
 	md5_state_t t_state;
 	md5_byte_t t_digest[16];
diff --git a/engine/src/sysosxrandom.cpp b/engine/src/sysosxrandom.cpp
diff --git a/engine/src/sysunxrandom.cpp b/engine/src/sysunxrandom.cpp
diff --git a/engine/src/sysw32random.cpp b/engine/src/sysw32random.cpp
diff --git a/engine/src/util.cpp b/engine/src/util.cpp
@@ -3199,15 +3199,6 @@ bool MCU_compare_strings_native(const char *p_a, bool p_a_isunicode, const char
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// MW-2013-05-21: [[ RandomBytes ]] Utility function for generating random bytes.
-bool MCU_random_bytes(size_t p_bytecount, MCDataRef& r_bytes)
-{
-	// IM-2014-08-06: [[ Bug 13038 ]] Use system implementation directly instead of SSL
-	return MCS_random_bytes(p_bytecount, r_bytes);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 #ifndef _DEBUG_MEMORY
 
 #ifdef __VISUALC__
diff --git a/engine/src/util.h b/engine/src/util.h
@@ -236,10 +236,6 @@ extern bool MCU_compare_strings_native(const char *p_a, bool p_a_isunicode, cons
 #endif
 extern double MCU_squared_distance_from_line(int4 sx, int4 sy, int4 ex, int4 ey, int4 x, int4 y);
 
-// MW-2013-05-21: [[ RandomBytes ]] Generate random bytes using either OpenSSL (if available)
-//   or platform support (if not).
-extern bool MCU_random_bytes(size_t p_bytecount, MCDataRef& r_bytes);
-
 // 
 
 struct MCInterval
diff --git a/engine/src/uuid.cpp b/engine/src/uuid.cpp
@@ -49,7 +49,7 @@ bool MCUuidGenerateRandom(MCUuid& r_uuid)
 	// Fill the UUID with random bytes (returns false if not enough random data
 	// is available).
     MCAutoDataRef t_data;
-	if (!MCU_random_bytes(sizeof(MCUuid), &t_data))
+	if (!MCDataCreateRandom (sizeof(MCUuid), &t_data))
 		return false;
     MCMemoryCopy(&r_uuid, MCDataGetBytePtr(*t_data), sizeof(MCUuid));
     

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void MCSecurityEvalRandomBytes(MCExecContext& ctxt, uinteger_t p_byte_count, MCD`
`83`	`83`	`return;`
`84`	`84`	`}`
`85`	`85`
`86`		`- if (MCU_random_bytes(p_byte_count, r_bytes))`
	`86`	`+ if (MCDataCreateRandom (p_byte_count, r_bytes))`
`87`	`87`	`{`
`88`	`88`	`ctxt.SetTheResultToEmpty();`
`89`	`89`	`return;`