Changeset 481 for trunk/src/sh_entropy.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (10 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_entropy.c (modified) (7 diffs)

trunk/src/sh_entropy.c

@@ -300 +300 @@
         {
           m_count = sl_read_timeout_fd(fd2, nbuf, nbytes, 
-                                       timeout_val, SL_FALSE);
+                                       timeout_val, S_FALSE);
           if (m_count < 0)
             m_count = 0;
@@ -337 +337 @@
 
 #ifdef NAME_OF_DEV_URANDOM
-  m_count = read_mbytes (  1, NAME_OF_DEV_RANDOM, nbuf, nbytes);
+  m_count = read_mbytes ( 10, NAME_OF_DEV_URANDOM, nbuf, nbytes);
 #else
-  m_count = read_mbytes (300, NAME_OF_DEV_RANDOM, nbuf, nbytes);
+  m_count = read_mbytes (300, NAME_OF_DEV_RANDOM,  nbuf, nbytes);
 #endif
 
@@ -346 +346 @@
 #ifdef NAME_OF_DEV_URANDOM
       sh_error_handle (SH_ERR_NOTICE, FIL__, __LINE__, EIO, MSG_NODEV, 
-                       (long) sh.real.uid, NAME_OF_DEV_RANDOM);
+                       (long) sh.real.uid, NAME_OF_DEV_URANDOM);
 #else
       sh_error_handle ((-1), FIL__, __LINE__, EIO, MSG_NODEV, 
@@ -353 +353 @@
     }
 
-#ifdef NAME_OF_DEV_URANDOM
+#ifdef NAME_OF_DEV_RANDOM
   if (m_count < nbytes)
     {
-      i = read_mbytes(30, NAME_OF_DEV_URANDOM, &nbuf[m_count], nbytes-m_count);
+      i = read_mbytes(300, NAME_OF_DEV_RANDOM, &nbuf[m_count], nbytes-m_count);
       if (i == 0)
         sh_error_handle ((-1), FIL__, __LINE__, EIO, MSG_NODEV, 
-                         (long) sh.real.uid, NAME_OF_DEV_URANDOM);
+                         (long) sh.real.uid, NAME_OF_DEV_RANDOM);
       else
         m_count += i;
@@ -601 +601 @@
       /* don't leak file descriptors
        */
-      sh_unix_closeall (3, -1, SL_TRUE); /* in child process */
+      sh_unix_closeall (3, -1, S_TRUE); /* in child process */
 
       /* zero priv info
@@ -942 +942 @@
     }
 
+#ifdef HAVE_GETTIMEOFDAY
+  {
+    unsigned short tseed[3];
+
+    gettimeofday(&tv, 0);
+    tseed[0] = tv.tv_sec & 0xFFFF;
+    tseed[1] = tv.tv_usec & 0xFFFF;
+    tseed[2] = (tv.tv_sec ^ tv.tv_usec) >> 16;
+    keybuf = (char *) sh_tiger_hash_uint32 ((char *) tseed, 
+                                            TIGER_DATA, sizeof(tseed),
+                                            kbuf, KEY_BYT/sizeof(UINT32));
+    memset(addbuf, '\0', sizeof(addbuf));
+    for (i = 0; i < KEY_BYT; ++i)
+      {
+        addbuf[i]         = keybuf[i];
+        addbuf[i+KEY_BYT] = skey->poolv[i];
+      }
+    SH_MUTEX_LOCK_UNSAFE(mutex_skey);
+    for (i = 0; i < KEY_BYT; ++i)
+      skey->poolv[i] ^= keybuf[i];
+    SH_MUTEX_UNLOCK_UNSAFE(mutex_skey);
+  }
+#endif
+
   if (bufcount > 0) 
     {
@@ -1002 +1026 @@
   char                 bufy[9 * sizeof(UINT32) + 1];
   int                  status;
-
-  memset(skey->poolv, '\0', KEY_BYT);
-
-  status = sh_entropy (24, bufx);
-  CuAssertTrue(tc, 0 == status);
-
-  memset(skey->poolv, '\0', KEY_BYT);
-
-  status = sh_entropy (24, bufy);
-  CuAssertTrue(tc, 0 == status);
-
-  CuAssertTrue(tc, 0 != memcmp(bufx, bufy, 24));
+  int                  count;
+
+  for (count = 0; count < 20; ++count)
+    {
+      memset(skey->poolv, '\0', KEY_BYT);
+      skey->poolc = 0;
+
+      status = sh_entropy (24, bufx);
+      CuAssertTrue(tc, 0 == status);
+      
+      memset(skey->poolv, '\0', KEY_BYT);
+      skey->poolc = 0;
+
+      status = sh_entropy (24, bufy);
+      CuAssertTrue(tc, 0 == status);
+      
+      CuAssertTrue(tc, 0 != memcmp(bufx, bufy, 24));
+    }
 }
 #endif