Changeset 156

Timestamp:

Jan 13, 2008, 7:25:06 PM (17 years ago)

Author:

katerina

Message:

Put result vector of rng in skey struct, fix HP-UX compile error.

Location:

trunk

Files:

• acconfig.h (modified) (1 diff)
• aclocal.m4 (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• docs/Changelog (modified) (1 diff)
• include/samhain.h (modified) (4 diffs)
• include/sh_unix.h (modified) (1 diff)
• include/slib.h (modified) (1 diff)
• src/sh_utils.c (modified) (3 diffs)

trunk/acconfig.h

@@ -342 +342 @@
 /* Define if UINT64 is 32 bits.                 */
 #undef UINT64_IS_32
+
+/* Define if you have uint64_t.               */
+#undef HAVE_UINT64_T
 
 /* Define if you have utmpx.h.                */

trunk/aclocal.m4

@@ -250 +250 @@
     sh_cv_typedef_foo=`echo sh_cv_typedef_$1 | sed -e 's% %_%g'`
     AC_CACHE_VAL( $sh_cv_typedef_foo,
-    [AC_TRY_COMPILE([#include <stdlib.h>
-    #include <sys/types.h>], [
+    [AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <sys/types.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif], [
     #undef $1
     int a = sizeof($1);

trunk/configure.ac

@@ -34 +34 @@
 AC_SUBST(BUILD_CC)
 
-GCC_STACK_PROTECT_LIB
-GCC_STACK_PROTECT_CC
+if test "x$GCC" == "xyes"; then
+   GCC_STACK_PROTECT_LIB
+   GCC_STACK_PROTECT_CC
+fi
 
 AC_HEADER_STDC
@@ -399 +401 @@
 AC_C_LONG_DOUBLE
 SH_CHECK_TYPEDEF(long long, HAVE_LONG_LONG)
+SH_CHECK_TYPEDEF(uint64_t, HAVE_UINT64_T)
 if test "$sh_HAVE_LONG_LONG" = "yes"; then
    AC_CHECK_SIZEOF(unsigned long long, 4)

trunk/docs/Changelog

@@ -1 +1 @@
 2.4.2:
+        * put result vector of rng in skey struct
         * fix more compiler warnings, and a potential (compiler-dependent)
           NULL dereference in the unix entropy collector

trunk/include/samhain.h

@@ -98 +98 @@
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
-#else
+#endif
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-#endif
-
-#if !defined(HAVE_INTTYPES_H) && !defined(HAVE_STDINT_H)
+
+#if !defined(HAVE_UINT64_T)
 
 #ifdef HAVE_LONG_LONG_64
@@ -112 +111 @@
 #define  UINT64 unsigned long
 #else
-#define UINT64_IS_32
-#define  UINT64 unsigned long
+#error "no 64bit type found"
 #endif
 #endif
@@ -135 +133 @@
 #define SH_MOD_ACTIVE  0
 #define SH_MOD_FAILED -1
- 
+
 /* Flags for file status
  */
@@ -325 +323 @@
   UINT32 rng2[3];
 
+  UINT32 res_vec[6];
+
   UINT32 ErrFlag[2];
 

trunk/include/sh_unix.h

@@ -23 +23 @@
 #define SH_UNIX_H
 
+/* For PATH_MAX */
 #include <limits.h>
+#if !defined(PATH_MAX)
+#define PATH_MAX 1024
+#endif
+
 #include <unistd.h>
 #include "samhain.h"

trunk/include/slib.h

@@ -68 +68 @@
 #define SL_GNUC_CONST   __attribute__((const))
 #else
-#undef  SH_GNUC_CONST
-#define SH_GNUC_CONST
+#undef  SL_GNUC_CONST
+#define SL_GNUC_CONST
 #endif
 

trunk/src/sh_utils.c

@@ -941 +941 @@
 UINT32 taus_get ()
 {
-  UINT32   taus_svec[6];
+#define TAUS_SAMPLE 12
+
+  UINT32   taus_svec[TAUS_SAMPLE];
   UINT32   retval;
   UINT32 * res;
-  static   UINT32   res_vec[6];
+  UINT32 * res_vec = &(skey->res_vec[0]);
   static   int      res_num = 0;
   register int i;
@@ -962 +964 @@
 
   SH_MUTEX_LOCK_UNSAFE(mutex_skey);
-  taus_svec[0] = taus_get_long (&(skey->rng0[0]));
-  taus_svec[1] = taus_get_long (&(skey->rng1[0]));
-  taus_svec[2] = taus_get_long (&(skey->rng2[0]));
-  taus_svec[3] = taus_get_long (&(skey->rng0[0]));
-  taus_svec[4] = taus_get_long (&(skey->rng1[0]));
-  taus_svec[5] = taus_get_long (&(skey->rng2[0]));
+  for (i = 0; i < (TAUS_SAMPLE/3); ++i)
+    {
+      taus_svec[i*3]   = taus_get_long (&(skey->rng0[0]));
+      taus_svec[i*3+1] = taus_get_long (&(skey->rng1[0]));
+      taus_svec[i*3+2] = taus_get_long (&(skey->rng2[0]));
+    }
   SH_MUTEX_UNLOCK_UNSAFE(mutex_skey);
 
   res     = sh_tiger_hash_uint32 ( (char *) &taus_svec[0], 
                                    TIGER_DATA, 
-                                   (unsigned long)(6 * sizeof(UINT32)),
+                                   (unsigned long)(TAUS_SAMPLE * sizeof(UINT32)),
                                    kbuf, KEY_BYT/sizeof(UINT32));
 
@@ -980 +982 @@
       res_vec[i] = res[i];
     }
-  retval  = taus_svec[0];
+  retval  = res[0];
   res_num = 1;
   SH_MUTEX_UNLOCK_UNSAFE(mutex_skey);
 
-  taus_svec[0] = 0; taus_svec[1] = 0; taus_svec[2] = 0; 
-  taus_svec[3] = 0; taus_svec[4] = 0; taus_svec[5] = 0; 
+  memset(taus_svec, '\0', TAUS_SAMPLE * sizeof(UINT32));
 
   return retval;