Changeset 52 for trunk/src

Timestamp:

Jul 24, 2006, 11:01:29 PM (18 years ago)

Author:

rainer

Message:

Fix stealth mode (regression in parser), add test for regression test suite

Location:

trunk/src

Files:

• samhain.c (modified) (3 diffs)
• sh_unix.c (modified) (3 diffs)

trunk/src/samhain.c

@@ -1449 +1449 @@
 
 #if (defined(WITH_GPG) || defined(WITH_PGP))
-  /* do nothing -- we exit earlier if error 
-  if (0 != sh_gpg_check_sign (1)) 
-    aud_exit(FIL__, __LINE__, EXIT_FAILURE);
-  */
+  /* do nothing -- we exit earlier if error */
 #else
   sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_1H,
@@ -1474 +1471 @@
     {
 #if (defined(WITH_GPG) || defined(WITH_PGP))
-      /* do nothing -- we exit earlier if error 
-         if (0 != sh_gpg_check_sign (2)) 
-         aud_exit(FIL__, __LINE__, EXIT_FAILURE);
-      */
-      ;
+      /* do nothing -- we exit earlier if error */
 #else
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_2H,
@@ -1489 +1482 @@
     {
 #if (defined(WITH_GPG) || defined(WITH_PGP))
-      /* do nothing -- we exit earlier if error 
-      if (0 != sh_gpg_check_sign (1)) 
-        aud_exit(FIL__, __LINE__, EXIT_FAILURE);
-      */
-      ;
+      /* do nothing -- we exit earlier if error */
 #else
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_1H,

trunk/src/sh_unix.c

@@ -4122 +4122 @@
 int sh_unix_getline_stealth (SL_TICKET fd, char * str, int len)
 {
-  int           add_off, llen;
-  unsigned long off_data = 0;
-  unsigned long max_data = 0;
-  static int    stealth_init = BAD;
+  int                  add_off, llen;
+  static unsigned long off_data = 0;
+  static unsigned long max_data = 0;
+  static int           stealth_init = BAD;
 
   SL_ENTER(_("sh_unix_getline_stealth"));
@@ -4144 +4144 @@
         }
       stealth_init = GOOD;
+      max_data += off_data;
     }
   
   /* --- Seek to proper position. ---
    */
+  if (off_data >= max_data)
+    {
+      dlog(1, FIL__, __LINE__, 
+           _("The capacity of the container image file for the stealth config file seems to be too small. Your config file is likely truncated.\n"));
+      sh_error_handle ((-1), FIL__, __LINE__,  EIO, MSG_P_NODATA,
+                       _("Stealth config file."));
+      aud_exit (FIL__, __LINE__, EXIT_FAILURE);
+    }
   sl_seek(fd, off_data);
      
@@ -4154 +4163 @@
   add_off   = hideout_hex_block(fd, (unsigned char *) str, len);
   off_data += add_off;
-
 
   llen = sl_strlen(str);