Changeset 481 for trunk/src/sh_utils.c

Timestamp:

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

Author:

katerina

Message:

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

File:

• trunk/src/sh_utils.c (modified) (8 diffs)

trunk/src/sh_utils.c

@@ -309 +309 @@
           }
         }
-        out[rem] = ','; ++rem;
-        while (p[1] == '\n') ++p; /* scan over consecutive newlines */
+        out[rem] = ','; ++rem;    /* <-- ensures (rem > 0) is true    */ 
+        while (p[1] == '\n') ++p; /* scan over consecutive newlines   */
         state = 0;
         if (p[1] == '\0') {
-          if (rem > 0) out[rem-1] = '\0';
+          out[rem-1] = '\0';      /* rem > 0 because of 4 lines above */
           break;
         }
@@ -782 +782 @@
   char hashbuf[KEYBUF_SIZE];
 
-
+  int         result;
   size_t      i;
 
   SL_ENTER(_("sh_util_hmac_tiger"));
-  ASSERT((KEY_BLOCK <= (KEY_LEN/2)), _("KEY_BLOCK <= (KEY_LEN/2)"))
-
-  if (KEY_BLOCK > (KEY_LEN/2))
-    {
-      (void) sh_tiger_hash (NULL, TIGER_DATA, 0, hashbuf, sizeof(hashbuf));
-      sl_strlcpy(res, hashbuf, len);
-      SL_RETURN(res, _("sh_util_hmac_tiger"));
-    }
+
+  ASSERT((KEY_BLOCK <= (KEY_LEN/2)), _("KEY_BLOCK <= (KEY_LEN/2)"));
 
   memcpy (K, zap, KEY_BLOCK);
 
-  if (sh_util_hextobinary (K, hexkey, KEY_LEN) < 0)
-    {
-      (void) sh_tiger_hash (NULL, TIGER_DATA, 0, hashbuf, sizeof(hashbuf));
-      sl_strlcpy(res, hashbuf, len);
-      SL_RETURN(res, _("sh_util_hmac_tiger"));
-    }
-
-  if (sl_ok_adds(textlen, KEY_BLOCK))
+  result = sh_util_hextobinary (K, hexkey, KEY_LEN);
+
+  ASSERT((result >= 0), _("result >= 0"));
+
+  if ((result >= 0) && sl_ok_adds(textlen, KEY_BLOCK))
     {
       inner = (char *) SH_ALLOC (textlen + KEY_BLOCK); 
@@ -830 +821 @@
   /* now compute the hash 
    */
-  h1 = sh_tiger_hash_uint32 ( outer,
-                              TIGER_DATA,
-                              KEY_BLOCK,
+  h1 = sh_tiger_hash_uint32 ( outer, TIGER_DATA, KEY_BLOCK,
                               kbuf, KEY_BYT/sizeof(UINT32));
   for (i = 0; i < (KEY_LEN/8); ++i)
-    {
-      /* cc[i] = h1[i]; */
-      copy_four ( (unsigned char *) &(cc[i]), h1[i]);
-    }
-
-  h2 = sh_tiger_hash_uint32 ( inner,
-                              TIGER_DATA,
+    copy_four ( (unsigned char *) &(cc[i]), h1[i]);
+
+  h2 = sh_tiger_hash_uint32 ( inner, TIGER_DATA,
                               (unsigned long) KEY_BLOCK+textlen,
                               kbuf, KEY_BYT/sizeof(UINT32));
   for (i = KEY_LEN/8; i < (KEY_LEN/4); ++i)
-    {
-      copy_four ( (unsigned char *) &(cc[i]), h2[i - (KEY_LEN/8)]);
-      /* cc[i] = h2[i - (KEY_LEN/8)]; */
-    }
+    copy_four ( (unsigned char *) &(cc[i]), h2[i - (KEY_LEN/8)]);
+
   SH_FREE(inner);
   
@@ -1033 +1016 @@
 
 
-/* interval [0, 4294967296]
+/* interval [0, 4294967295]
  */
 static UINT32 taus_get_long (void *vstate)
@@ -1160 +1143 @@
   char                 bufx[9 * sizeof(UINT32) + 1];
   int                  status;
-  static unsigned long seed_time = 0;
+  static unsigned long seed_time    = 0;
+  static unsigned long seed_counter = 3000;
   unsigned long        gtime;
 
@@ -1167 +1151 @@
   if (skey->rngI == GOOD)
     {
-      if ( (sh_unix_longtime () - seed_time) < 7200)
+      ++seed_counter;
+
+      if ( ((sh_unix_longtime () - seed_time) < 1800) &&
+           ( seed_counter                     < 3000))
         SL_RETURN( (0), _("taus_seed"));
     }
   
-  seed_time = sh_unix_longtime ();
+  seed_time    = sh_unix_longtime ();
+  seed_counter = 0;
 
   status = sh_entropy (24, bufx);
@@ -1834 +1822 @@
 int sh_util_obscurename (ShErrLevel level, const char * name_orig, int flag)
 {
-  const unsigned char * name = (unsigned char *) name_orig;
+  const unsigned char * name = (const unsigned char *) name_orig;
   char * safe;
   unsigned int i;
@@ -2308 +2296 @@
   unsigned char b;
   size_t lout = 0;
-  int    w = 0;
+  unsigned int  w = 0;
 
   if (out && in)