1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
diff --git configure.in configure.in
index 7bed45f..053de17 100644
--- configure.in
+++ configure.in
@@ -2950,7 +2950,7 @@ dnl Checks for library functions.
dnl ========================================================
AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r)
+AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
index 0687344..ca3ff8b 100644
--- xpcom/base/nsUUIDGenerator.cpp
+++ xpcom/base/nsUUIDGenerator.cpp
@@ -16,6 +16,10 @@
#include "nsUUIDGenerator.h"
+#ifdef ANDROID
+extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
+#endif
+
using namespace mozilla;
NS_IMPL_ISUPPORTS(nsUUIDGenerator, nsIUUIDGenerator)
@@ -35,7 +39,7 @@ nsUUIDGenerator::Init()
// We're a service, so we're guaranteed that Init() is not going
// to be reentered while we're inside Init().
-#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
/* initialize random number generator using NSPR random noise */
unsigned int seed;
@@ -72,7 +76,7 @@ nsUUIDGenerator::Init()
}
#endif
-#endif /* non XP_WIN and non XP_MACOSX */
+#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
return NS_OK;
}
@@ -122,13 +126,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
* back to it; instead, we use the value returned when we called
* initstate, since older glibc's have broken setstate() return values
*/
-#ifndef ANDROID
+#ifndef HAVE_ARC4RANDOM
setstate(mState);
#endif
+#ifdef HAVE_ARC4RANDOM_BUF
+ arc4random_buf(aId, sizeof(nsID));
+#else /* HAVE_ARC4RANDOM_BUF */
size_t bytesLeft = sizeof(nsID);
while (bytesLeft > 0) {
-#ifdef ANDROID
+#ifdef HAVE_ARC4RANDOM
long rval = arc4random();
const size_t mRBytes = 4;
#else
@@ -150,6 +157,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
bytesLeft -= toWrite;
}
+#endif /* HAVE_ARC4RANDOM_BUF */
/* Put in the version */
aId->m2 &= 0x0fff;
@@ -159,7 +167,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
aId->m3[0] &= 0x3f;
aId->m3[0] |= 0x80;
-#ifndef ANDROID
+#ifndef HAVE_ARC4RANDOM
/* Restore the previous RNG state */
setstate(mSavedState);
#endif
diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
index 6a24212..68ed6f2 100644
--- xpcom/base/nsUUIDGenerator.h
+++ xpcom/base/nsUUIDGenerator.h
@@ -29,7 +29,7 @@ private:
protected:
mozilla::Mutex mLock;
-#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
char mState[128];
char* mSavedState;
uint8_t mRBytes;
|
