[Forensics-changes] [yara] 04/10: Drop patches that have been integrated upstream

Hilko Bengen bengen at moszumanska.debian.org
Tue Aug 30 21:46:00 UTC 2016


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

bengen pushed a commit to branch master
in repository yara.

commit 71e702a657141e5009f9c15d00e4bf750bd9579b
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed Aug 3 21:57:43 2016 +0200

    Drop patches that have been integrated upstream
---
 ...ossible-buffer-overrun-in-pe_parse_header.patch | 24 -----------------
 ...002-Make-pe.c-compatible-with-OpenSSL-1.1.patch | 31 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 57 deletions(-)

diff --git a/debian/patches/0001-Fix-possible-buffer-overrun-in-pe_parse_header.patch b/debian/patches/0001-Fix-possible-buffer-overrun-in-pe_parse_header.patch
deleted file mode 100644
index ccfafc4..0000000
--- a/debian/patches/0001-Fix-possible-buffer-overrun-in-pe_parse_header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sun, 2 Aug 2015 23:04:58 +0200
-Subject: Fix possible buffer overrun in pe_parse_header
-
-(See upstream commits 6ad11828a8d9784777f50236930112f8d3360f1b and
-14dbf62b132c1d7294fa3b4a535d5fec3f6246b9)
----
- libyara/modules/pe.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libyara/modules/pe.c b/libyara/modules/pe.c
-index 848822d..4dcc13c 100644
---- a/libyara/modules/pe.c
-+++ b/libyara/modules/pe.c
-@@ -1304,7 +1304,8 @@ void pe_parse_header(
-     if (!struct_fits_in_pe(pe, section, IMAGE_SECTION_HEADER))
-       break;
- 
--    strlcpy(section_name, (char*) section->Name, IMAGE_SIZEOF_SHORT_NAME + 1);
-+    strncpy(section_name, (char*) section->Name, IMAGE_SIZEOF_SHORT_NAME);
-+    section_name[IMAGE_SIZEOF_SHORT_NAME] = '\0';
- 
-     set_string(
-         section_name,
diff --git a/debian/patches/0002-Make-pe.c-compatible-with-OpenSSL-1.1.patch b/debian/patches/0002-Make-pe.c-compatible-with-OpenSSL-1.1.patch
deleted file mode 100644
index e2874bb..0000000
--- a/debian/patches/0002-Make-pe.c-compatible-with-OpenSSL-1.1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Mon, 27 Jun 2016 18:09:10 +0200
-Subject: Make pe.c compatible with OpenSSL 1.1
-
----
- libyara/modules/pe.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libyara/modules/pe.c b/libyara/modules/pe.c
-index 4dcc13c..0241bde 100644
---- a/libyara/modules/pe.c
-+++ b/libyara/modules/pe.c
-@@ -29,6 +29,9 @@ limitations under the License.
- #include <openssl/bio.h>
- #include <openssl/pkcs7.h>
- #include <openssl/x509.h>
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define X509_get_signature_nid(o) OBJ_obj2nid((o)->sig_alg->algorithm)
-+#endif
- #endif
- 
- #include <yara/pe.h>
-@@ -1155,7 +1158,7 @@ void pe_parse_certificates(
-           pe->object,
-           "signatures[%i].version", counter);
- 
--      const char* sig_alg = OBJ_nid2ln(OBJ_obj2nid(cert->sig_alg->algorithm));
-+      const char* sig_alg = OBJ_nid2ln(X509_get_signature_nid(cert));
- 
-       set_string(sig_alg, pe->object, "signatures[%i].algorithm", counter);
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f64a13d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-possible-buffer-overrun-in-pe_parse_header.patch
-0002-Make-pe.c-compatible-with-OpenSSL-1.1.patch

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



More information about the forensics-changes mailing list