[gentoo-commits] gentoo-x86 commit in app-forensics/aide/files: aide-0.13.1-equ-matching.patch aide-0.13.1-libgrypt_init.patch

[Matsuu Takuto (matsuu)]

matsuu      09/04/16 14:59:19

  Added:                aide-0.13.1-equ-matching.patch
                        aide-0.13.1-libgrypt_init.patch
  Log:
  Fixed bug #204217 and #266175.
  (Portage version: 2.1.6.11/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-forensics/aide/files/aide-0.13.1-equ-matching.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-forensics/aide/files/aide-0.13.1-equ-matching.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-forensics/aide/files/aide-0.13.1-equ-matching.patch?rev=1.1&content-type=text/plain

Index: aide-0.13.1-equ-matching.patch
===================================================================
--- src/gen_list.c.orig	2007-12-19 15:37:13.000000000 -0800
+++ src/gen_list.c	2007-12-19 16:19:43.000000000 -0800
@@ -732,33 +732,6 @@
   return retval;
 }
 
-//this is used to check if $text if equal to a node in $rxrlist
-//should be used to check equ_rx_lst only
-int check_list_for_equal(list* rxrlist,char* text,DB_ATTR_TYPE* attr)
-{
-  list* r=NULL;
-  int retval=1;
-  char *temp;
-
-  for(r=rxrlist;r;r=r->next){
-    temp=((rx_rule*)r->data)->rx;
-    
-    //FIXME, if rx not begin with ^, may need to do something else
-    if(temp[0]=='^') //^ is for reg exp, we can ignore this character
-      temp++;
-
-    //we don't need to worry about buff-overflow, so strcmp is safe
-    if((retval=strcmp(temp, text))==0){
-      *attr=((rx_rule*)r->data)->attr;
-      error(231,"\"%s\" matches string from line #%ld: %s\n",text,((rx_rule*)r->data)->conf_lineno,((rx_rule*)r->data)->rx);
-      break;
-    } else {
-      error(231,"\"%s\" doesn't match string from line #%ld: %s\n",text,((rx_rule*)r->data)->conf_lineno,((rx_rule*)r->data)->rx);
-    }
-  }
-  return retval;
-}
-
 /* 
  * Function check_node_for_match()
  * calls itself recursively to go to the top and then back down.
@@ -783,35 +756,24 @@
     return retval;
   }
   
-  /* We need this to check whether this was the first one *
-   * to be called and not a recursive call */
-  if(!((retval&16)==16)){
-    retval|=16;
+  /* if this call is not recursive we check the equals list and we set top *
+   * and retval so we know following calls are recursive */
+  if(!(retval&16)){
     top=1;
-  } else {
-    top=0;
-  }
-  
-  /* if no deeper match found */
-  if(!((retval&8)==8)&&!((retval&4)==4)){
+    retval|=16;
+
     if(!check_list_for_match(node->equ_rx_lst,text,attr)){
-      /*
-	Zhi Wen Wong added this line to fix bug that equ not work for 
-	compare
-	if we do "=/bin", we should only check /bin
-	so, /bin/bash or /bin/something should return 0 as neg
-      */
-      if(!check_list_for_equal(node->equ_rx_lst,text,attr))
-	retval|=(2|4);
-    };
-  };
+      retval|=2|4;
+    }
+  }
   /* We'll use retval to pass information on whether to recurse 
    * the dir or not */
 
 
-  if(!((retval&8)==8)&&!((retval&4)==4)){
+  /* If 4 and 8 are not set, we will check for matches */
+  if(!(retval&(4|8))){
     if(!check_list_for_match(node->sel_rx_lst,text,attr))
-      retval|=(1|8);
+      retval|=1|8;
   }
 
   /* Now let's check the ancestors */



1.1                  app-forensics/aide/files/aide-0.13.1-libgrypt_init.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-forensics/aide/files/aide-0.13.1-libgrypt_init.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-forensics/aide/files/aide-0.13.1-libgrypt_init.patch?rev=1.1&content-type=text/plain

Index: aide-0.13.1-libgrypt_init.patch
===================================================================
diff -urp aide-0.13.1.orig/doc/aide.1 aide-0.13.1/doc/aide.1
--- aide-0.13.1.orig/doc/aide.1	2009-04-14 15:46:20.000000000 -0700
+++ aide-0.13.1/doc/aide.1	2009-04-14 15:49:18.000000000 -0700
@@ -67,6 +67,7 @@ conditions:
 .IP "16 Unimplemented function error"
 .IP "17 Invalid configureline error"
 .IP "18 IO error"
+.IP "19 Version mismatch error"
 .PP
 .SH NOTES
 Please note that due to mmap issues, aide cannot be terminated with
diff -urp aide-0.13.1.orig/doc/aide.1.in aide-0.13.1/doc/aide.1.in
--- aide-0.13.1.orig/doc/aide.1.in	2009-04-14 15:46:20.000000000 -0700
+++ aide-0.13.1/doc/aide.1.in	2009-04-14 15:49:56.000000000 -0700
@@ -67,6 +67,7 @@ conditions:
 .IP "16 Unimplemented function error"
 .IP "17 Invalid configureline error"
 .IP "18 IO error"
+.IP "19 Version mismatch error"
 .PP
 .SH NOTES
 Please note that due to mmap issues, aide cannot be terminated with
diff -urp aide-0.13.1.orig/include/report.h aide-0.13.1/include/report.h
--- aide-0.13.1.orig/include/report.h	2009-04-14 15:46:20.000000000 -0700
+++ aide-0.13.1/include/report.h	2009-04-14 15:46:28.000000000 -0700
@@ -31,6 +31,7 @@
 #define UNIMPLEMENTED_FUNCTION_ERROR 16
 #define INVALID_CONFIGURELINE_ERROR 17
 #define IO_ERROR 18
+#define VERSION_MISMATCH_ERROR 19
 
 /* Errorcodes */
 #define HASH_ALGO_ERROR 30
diff -urp aide-0.13.1.orig/src/md.c aide-0.13.1/src/md.c
--- aide-0.13.1.orig/src/md.c	2009-04-14 15:46:20.000000000 -0700
+++ aide-0.13.1/src/md.c	2009-04-14 15:46:28.000000000 -0700
@@ -201,6 +201,12 @@ int init_md(struct md_container* md) {
 #endif 
 #ifdef WITH_GCRYPT
   error(255,"Gcrypt library initialization\n");
+  	if(!gcry_check_version(GCRYPT_VERSION)) {
+		error(0,"libgcrypt version mismatch\n");
+		exit(VERSION_MISMATCH_ERROR);
+	}
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 	if(gcry_md_open(&md->mdh,0,0)!=GPG_ERR_NO_ERROR){
 		error(0,"gcrypt_md_open failed\n");
 		exit(IO_ERROR);