[Forensics-changes] [yara] 159/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 083ec11220e77b3b50c5e69b81ee4911cd0f8fe4
Merge: a2d920a 3c4b246
Author: Wesley Shields <wxs at atarininja.org>
Date:   Wed Oct 29 12:30:39 2014 -0400

    Merge branch 'master' into authenticode

 libyara/exec.c                        |    3 +-
 libyara/grammar.c                     |    2 +-
 libyara/grammar.y                     |    2 +-
 libyara/include/yara/hash.h           |    2 +-
 libyara/include/yara/pe.h             |   41 +-
 libyara/include/yara/strutils.h       |   40 +-
 libyara/mem.c                         |    9 +-
 libyara/object.c                      |   29 +-
 libyara/strutils.c                    |   71 +-
 windows/include/openssl/aes.h         |  147 ++
 windows/include/openssl/asn1.h        | 1404 ++++++++++++
 windows/include/openssl/asn1_mac.h    |  578 +++++
 windows/include/openssl/asn1t.h       |  960 ++++++++
 windows/include/openssl/bio.h         |  847 +++++++
 windows/include/openssl/blowfish.h    |  129 ++
 windows/include/openssl/bn.h          |  902 ++++++++
 windows/include/openssl/buffer.h      |  119 +
 windows/include/openssl/camellia.h    |  130 ++
 windows/include/openssl/cast.h        |  107 +
 windows/include/openssl/cmac.h        |   82 +
 windows/include/openssl/cms.h         |  501 ++++
 windows/include/openssl/comp.h        |   80 +
 windows/include/openssl/conf.h        |  263 +++
 windows/include/openssl/conf_api.h    |   89 +
 windows/include/openssl/crypto.h      |  611 +++++
 windows/include/openssl/des.h         |  248 ++
 windows/include/openssl/des_old.h     |  446 ++++
 windows/include/openssl/dh.h          |  280 +++
 windows/include/openssl/dsa.h         |  327 +++
 windows/include/openssl/dso.h         |  409 ++++
 windows/include/openssl/dtls1.h       |  288 +++
 windows/include/openssl/e_os2.h       |  315 +++
 windows/include/openssl/ebcdic.h      |   26 +
 windows/include/openssl/ec.h          | 1167 ++++++++++
 windows/include/openssl/ecdh.h        |  125 +
 windows/include/openssl/ecdsa.h       |  260 +++
 windows/include/openssl/engine.h      |  842 +++++++
 windows/include/openssl/err.h         |  386 ++++
 windows/include/openssl/evp.h         | 1409 ++++++++++++
 windows/include/openssl/hmac.h        |  110 +
 windows/include/openssl/idea.h        |  103 +
 windows/include/openssl/krb5_asn.h    |  256 +++
 windows/include/openssl/kssl.h        |  192 ++
 windows/include/openssl/lhash.h       |  241 ++
 windows/include/openssl/md4.h         |  120 +
 windows/include/openssl/md5.h         |  120 +
 windows/include/openssl/mdc2.h        |   98 +
 windows/include/openssl/modes.h       |  141 ++
 windows/include/openssl/obj_mac.h     | 4032 +++++++++++++++++++++++++++++++++
 windows/include/openssl/objects.h     | 1138 ++++++++++
 windows/include/openssl/ocsp.h        |  623 +++++
 windows/include/openssl/opensslconf.h |  247 ++
 windows/include/openssl/opensslv.h    |   96 +
 windows/include/openssl/ossl_typ.h    |  209 ++
 windows/include/openssl/pem.h         |  641 ++++++
 windows/include/openssl/pem2.h        |   70 +
 windows/include/openssl/pkcs12.h      |  331 +++
 windows/include/openssl/pkcs7.h       |  496 ++++
 windows/include/openssl/pqueue.h      |  100 +
 windows/include/openssl/rand.h        |  150 ++
 windows/include/openssl/rc2.h         |  103 +
 windows/include/openssl/rc4.h         |   90 +
 windows/include/openssl/ripemd.h      |  107 +
 windows/include/openssl/rsa.h         |  583 +++++
 windows/include/openssl/safestack.h   | 2671 ++++++++++++++++++++++
 windows/include/openssl/seed.h        |  139 ++
 windows/include/openssl/sha.h         |  214 ++
 windows/include/openssl/srp.h         |  172 ++
 windows/include/openssl/srtp.h        |  149 ++
 windows/include/openssl/ssl.h         | 2605 +++++++++++++++++++++
 windows/include/openssl/ssl2.h        |  272 +++
 windows/include/openssl/ssl23.h       |   83 +
 windows/include/openssl/ssl3.h        |  699 ++++++
 windows/include/openssl/stack.h       |  108 +
 windows/include/openssl/symhacks.h    |  481 ++++
 windows/include/openssl/tls1.h        |  744 ++++++
 windows/include/openssl/ts.h          |  858 +++++++
 windows/include/openssl/txt_db.h      |  112 +
 windows/include/openssl/ui.h          |  383 ++++
 windows/include/openssl/ui_compat.h   |   83 +
 windows/include/openssl/whrlpool.h    |   41 +
 windows/include/openssl/x509.h        | 1297 +++++++++++
 windows/include/openssl/x509_vfy.h    |  567 +++++
 windows/include/openssl/x509v3.h      | 1007 ++++++++
 windows/lib/libeay32.lib              |  Bin 0 -> 13463618 bytes
 windows/lib/libeay64.lib              |  Bin 0 -> 14038474 bytes
 windows/libyara/libyara.vcxproj       |   16 +-
 yara-python/setupwin32.py             |    2 +-
 yara-python/setupwin64.py             |    2 +-
 89 files changed, 36714 insertions(+), 64 deletions(-)


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