Changeset 147 for trunk/src/sh_entropy.c

Timestamp:

Nov 26, 2007, 8:34:29 PM (17 years ago)

Author:

katerina

Message:

Fix regression in the seeding routine of the PRNG

File:

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

trunk/src/sh_entropy.c

@@ -295 +295 @@
       if (0 == sh_unix_device_readable(fd2)) 
         {
-          m_count = sl_read_timeout_fd(fd2, &nbuf, nbytes, 
+          m_count = sl_read_timeout_fd(fd2, nbuf, nbytes, 
                                        timeout_val, SL_FALSE);
           if (m_count < 0)
@@ -387 +387 @@
       SH_MUTEX_UNLOCK_UNSAFE(mutex_skey);
       memset (keybuf, '\0', KEY_BYT);
+      memset (kbuf,   '\0', sizeof(kbuf));
       
       SL_RETURN(0, _("sh_entropy"));
@@ -960 +961 @@
 #endif
 
-
-
-
-
-
-
+#ifdef SH_CUTEST
+#include "CuTest.h"
+
+void Test_entropy (CuTest *tc)
+{
+  char                 bufx[9 * sizeof(UINT32) + 1];
+  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));
+}
+#endif
+
+
+
+
+
+
+
+