@@ -98,21+94,17 @@ std::string TreeSocket::RandString(unsigned int ilength)
{
char* randombuf = new char[ilength+1];
std::string out;
{
char* randombuf = new char[ilength+1];
std::string out;
-#ifdef WINDOWS
- int f = -1;
-#else
+#ifndef WINDOWS
int f = open("/dev/urandom", O_RDONLY, 0);
int f = open("/dev/urandom", O_RDONLY, 0);
-#endif
if (f >= 0)
{
if (f >= 0)
{
-#ifndef WINDOWS
- if (read(f, randombuf, ilength) < 1)
- ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "There are crack smoking monkeys in your kernel (in other words, nonblocking /dev/urandom blocked.)");
+ if (read(f, randombuf, ilength) < (int)ilength)
+ ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Entropy source has gone predictable (did not return enough data)");
close(f);
close(f);
-#endif
}
else
}
else
+#endif
{
for (unsigned int i = 0; i < ilength; i++)
randombuf[i] = rand();
{
for (unsigned int i = 0; i < ilength; i++)
randombuf[i] = rand();
@@ -120,8+112,8 @@ std::string TreeSocket::RandString(unsigned int ilength)