X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=util.c;h=3c2e4bd6db69fbe35ffe39f5e1bfab2cf2529fc7;hp=2376a6193ba27e583e7e0c6c306664339a6f966a;hb=2d51356d04b722522a52a94594f3fd87632a02ec;hpb=86ae6f2670e6d7a62d9fbb2243c8aae28b925645

diff --git a/util.c b/util.c
index 2376a61..3c2e4bd 100644
--- a/util.c
+++ b/util.c
@@ -27,7 +27,6 @@
 #include <sys/time.h>           /* gettimeofday */
 #include <sys/times.h>          /* times */
 #include <errno.h>
-#include <X11/Xlib.h>           /* Window */
 #include "rdesktop.h"
 
 #ifdef EGD_SOCKET
@@ -75,6 +74,51 @@ generate_random_egd(uint8 * buf)
 }
 #endif
 
+/* Generate a 32-byte random for the secure transport code. */
+void
+generate_random(uint8 * random)
+{
+	struct stat st;
+	struct tms tmsbuf;
+	MD5_CTX md5;
+	uint32 *r;
+	int fd, n;
+
+	/* If we have a kernel random device, try that first */
+	if (((fd = open("/dev/urandom", O_RDONLY)) != -1)
+			|| ((fd = open("/dev/random", O_RDONLY)) != -1))
+	{
+		n = read(fd, random, 32);
+		close(fd);
+		if (n == 32)
+			return;
+	}
+
+#ifdef EGD_SOCKET
+	/* As a second preference use an EGD */
+	if (generate_random_egd(random))
+		return;
+#endif
+
+	/* Otherwise use whatever entropy we can gather - ideas welcome. */
+	r = (uint32 *) random;
+	r[0] = (getpid()) | (getppid() << 16);
+	r[1] = (getuid()) | (getgid() << 16);
+	r[2] = times(&tmsbuf);  /* system uptime (clocks) */
+	gettimeofday((struct timeval *) &r[3], NULL);   /* sec and usec */
+	stat("/tmp", &st);
+	r[5] = st.st_atime;
+	r[6] = st.st_mtime;
+	r[7] = st.st_ctime;
+
+	/* Hash both halves with MD5 to obscure possible patterns */
+	MD5_Init(&md5);
+	MD5_Update(&md5, random, 16);
+	MD5_Final(random, &md5);
+	MD5_Update(&md5, random + 16, 16);
+	MD5_Final(random + 16, &md5);
+}
+
 /* malloc; exit if out of memory */
 void *
 xmalloc(int size)
@@ -119,6 +163,8 @@ error(char *format, ...)
 	va_start(ap, format);
 	vfprintf(stderr, format, ap);
 	va_end(ap);
+
+	exit(1);
 }
 
 /* report a warning */