From: John Törnblom <john.tornblom@gmail.com>
Date: Wed, 2 Feb 2011 18:11:37 +0000 (+0100)
Subject: Use OpenSSL to generate a random number, it is probobly better at it.
X-Git-Tag: 2.99~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4a0f14081928fb6bc98fbfaa25b9beb4f906b3b;p=thirdparty%2Ftvheadend.git

Use OpenSSL to generate a random number, it is probobly better at it.
---

diff --git a/src/access.c b/src/access.c
index 6307196c4..080d6d848 100644
--- a/src/access.c
+++ b/src/access.c
@@ -30,6 +30,7 @@
 #include <arpa/inet.h>
 
 #include <openssl/sha.h>
+#include <openssl/rand.h>
 
 #include "tvheadend.h"
 #include "access.h"
@@ -90,23 +91,13 @@ access_ticket_create(const char *resource)
 {
   uint8_t buf[20];
   char id[41];
-  unsigned int i, rnd;
+  unsigned int i;
   access_ticket_t *at;
-  SHA_CTX shactx;
-  
   static const char hex_string[16] = "0123456789ABCDEF";
-  
 
   at = calloc(1, sizeof(access_ticket_t));
-  rnd = time(NULL);
-  
-  //Generate a pseudo-random ticket id
-  SHA_Init(&shactx);
-  for(i=0; i<5; i++) {
-    SHA_Update(&shactx, (const uint8_t *)&rnd, sizeof(int));
-    rnd = rand_r(&rnd);
-  }
-  SHA_Final(buf, &shactx);
+
+  RAND_bytes(buf, 20);
 
   //convert to hexstring
   for(i=0; i<sizeof(buf); i++){
@@ -539,6 +530,15 @@ access_init(int createdefault)
   access_entry_t *ae;
   const char *s;
 
+  static struct {
+    pid_t pid;
+    struct timeval tv;
+  } randseed;
+
+  randseed.pid = getpid();
+  gettimeofday(&randseed.tv, NULL);
+  RAND_seed(&randseed, sizeof(randseed));
+
   TAILQ_INIT(&access_entries);
   TAILQ_INIT(&access_tickets);