[Forensics-changes] [yara] 150/407: Merge branch 'master' into authenticode

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.3.0
in repository yara.

commit a2d920aafa39531501840c012ce1f93e24a8c926
Merge: 5aa4262 aaee659
Author: Wesley Shields <wxs at atarininja.org>
Date:   Tue Oct 28 12:53:08 2014 -0400

    Merge branch 'master' into authenticode
    
    Conflicts:
    	libyara/modules/pe.c

 configure.ac         | 57 ++++++++++++++++++++++++++++++++++++----------------
 libyara/Makefile.am  |  1 +
 libyara/modules/pe.c | 17 +++++++++++++++-
 3 files changed, 57 insertions(+), 18 deletions(-)

diff --cc libyara/modules/pe.c
index e5e5018,3d7cccc..55e40e6
--- a/libyara/modules/pe.c
+++ b/libyara/modules/pe.c
@@@ -18,13 -18,13 +18,18 @@@ limitations under the License
  
  #include <stdio.h>
  #include <ctype.h>
+ 
+ #include <config.h>
+ 
+ #if defined(HAVE_LIBCRYPTO)
  #include <openssl/md5.h>
  #include <openssl/sha.h>
 +#include <openssl/safestack.h>
 +#include <openssl/asn1.h>
 +#include <openssl/bio.h>
 +#include <openssl/pkcs7.h>
 +#include <openssl/x509.h>
+ #endif
  
  #include <yara/pe.h>
  #include <yara/modules.h>
@@@ -3074,19 -2897,7 +3090,18 @@@ begin_declarations
    declare_function("imports", "ss", "i", imports);
    declare_function("locale", "i", "i", locale);
    declare_function("language", "i", "i", language);
-   declare_function("imphash", "", "s", imphash);
  
 +  begin_struct_array("signatures");
 +    declare_string("issuer");
 +    declare_string("subject");
 +    declare_integer("version");
 +    declare_string("algorithm");
 +    declare_string("serial");
 +    declare_string("not_before");
 +    declare_string("not_after");
 +  end_struct_array("signatures");
 +  declare_integer("number_of_signatures");
 +
  end_declarations;
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git