yara: Update to 3.11.0

Fixed license information.

Several Makefile rearrangements for consistency between packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-10-31 18:37:12 -07:00
parent 1b4f838815
commit 70be5dbfc6
2 changed files with 7 additions and 29 deletions
@@ -1,24 +0,0 @@
--- a/libyara/modules/pe.c
+++ b/libyara/modules/pe.c
@@ -42,6 +42,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <openssl/x509.h>
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define X509_get_signature_nid(o) OBJ_obj2nid((o)->sig_alg->algorithm)
+#define X509_getm_notBefore X509_get_notBefore
+#define X509_getm_notAfter X509_get_notAfter
#endif
#endif
@@ -1326,10 +1328,10 @@ void pe_parse_certificates(
}
}
- date_time = ASN1_get_time_t(X509_get_notBefore(cert));
+ date_time = ASN1_get_time_t(X509_getm_notBefore(cert));
set_integer(date_time, pe->object, "signatures[%i].not_before", counter);
- date_time = ASN1_get_time_t(X509_get_notAfter(cert));
+ date_time = ASN1_get_time_t(X509_getm_notAfter(cert));
set_integer(date_time, pe->object, "signatures[%i].not_after", counter);
counter++;