[Forensics-changes] [yara] 397/407: Define section characteristics constants as they appear in winnt.h

[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 a78f4c9bab95e2d1830ca4fc9e8cede5c90ed31b
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Mon Feb 9 12:01:21 2015 +0100

    Define section characteristics constants as they appear in winnt.h
---
 libyara/include/yara/pe.h | 26 +++++++++++++-------------
 libyara/modules/pe.c      | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/libyara/include/yara/pe.h b/libyara/include/yara/pe.h
index c6f43e6..ca6d587 100644
--- a/libyara/include/yara/pe.h
+++ b/libyara/include/yara/pe.h
@@ -149,19 +149,19 @@ typedef struct _IMAGE_FILE_HEADER {
 #define IMAGE_FILE_MACHINE_WCEMIPSV2         0x0169
 
 // Section characteristics
-#define SECTION_CNT_CODE                     0x00000020
-#define SECTION_CNT_INITIALIZED_DATA         0x00000040
-#define SECTION_CNT_UNINITIALIZED_DATA       0x00000080
-#define SECTION_GPREL                        0x00008000
-#define SECTION_MEM_16BIT                    0x00020000
-#define SECTION_LNK_NRELOC_OVFL              0x01000000
-#define SECTION_MEM_DISCARDABLE              0x02000000
-#define SECTION_MEM_NOT_CACHED               0x04000000
-#define SECTION_MEM_NOT_PAGED                0x08000000
-#define SECTION_MEM_SHARED                   0x10000000
-#define SECTION_MEM_EXECUTE                  0x20000000
-#define SECTION_MEM_READ                     0x40000000
-#define SECTION_MEM_WRITE                    0x80000000
+#define IMAGE_SCN_CNT_CODE                   0x00000020
+#define IMAGE_SCN_CNT_INITIALIZED_DATA       0x00000040
+#define IMAGE_SCN_CNT_UNINITIALIZED_DATA     0x00000080
+#define IMAGE_SCN_GPREL                      0x00008000
+#define IMAGE_SCN_MEM_16BIT                  0x00020000
+#define IMAGE_SCN_LNK_NRELOC_OVFL            0x01000000
+#define IMAGE_SCN_MEM_DISCARDABLE            0x02000000
+#define IMAGE_SCN_MEM_NOT_CACHED             0x04000000
+#define IMAGE_SCN_MEM_NOT_PAGED              0x08000000
+#define IMAGE_SCN_MEM_SHARED                 0x10000000
+#define IMAGE_SCN_MEM_EXECUTE                0x20000000
+#define IMAGE_SCN_MEM_READ                   0x40000000
+#define IMAGE_SCN_MEM_WRITE                  0x80000000
 
 //
 // Directory format.
diff --git a/libyara/modules/pe.c b/libyara/modules/pe.c
index 385ec54..2bc1e21 100644
--- a/libyara/modules/pe.c
+++ b/libyara/modules/pe.c
@@ -1948,43 +1948,43 @@ int module_load(
       "BYTES_REVERSED_HI");
 
   set_integer(
-      SECTION_CNT_CODE, module_object,
+      IMAGE_SCN_CNT_CODE, module_object,
       "SECTION_CNT_CODE");
   set_integer(
-      SECTION_CNT_INITIALIZED_DATA, module_object,
+      IMAGE_SCN_CNT_INITIALIZED_DATA, module_object,
       "SECTION_CNT_INITIALIZED_DATA");
   set_integer(
-      SECTION_CNT_UNINITIALIZED_DATA, module_object,
+      IMAGE_SCN_CNT_UNINITIALIZED_DATA, module_object,
       "SECTION_CNT_UNINITIALIZED_DATA");
   set_integer(
-      SECTION_GPREL, module_object,
+      IMAGE_SCN_GPREL, module_object,
       "SECTION_GPREL");
   set_integer(
-      SECTION_MEM_16BIT, module_object,
+      IMAGE_SCN_MEM_16BIT, module_object,
       "SECTION_MEM_16BIT");
   set_integer(
-      SECTION_LNK_NRELOC_OVFL, module_object,
+      IMAGE_SCN_LNK_NRELOC_OVFL, module_object,
       "SECTION_LNK_NRELOC_OVFL");
   set_integer(
-      SECTION_MEM_DISCARDABLE, module_object,
+      IMAGE_SCN_MEM_DISCARDABLE, module_object,
       "SECTION_MEM_DISCARDABLE");
   set_integer(
-      SECTION_MEM_NOT_CACHED, module_object,
+      IMAGE_SCN_MEM_NOT_CACHED, module_object,
       "SECTION_MEM_NOT_CACHED");
   set_integer(
-      SECTION_MEM_NOT_PAGED, module_object,
+      IMAGE_SCN_MEM_NOT_PAGED, module_object,
       "SECTION_MEM_NOT_PAGED");
   set_integer(
-      SECTION_MEM_SHARED, module_object,
+      IMAGE_SCN_MEM_SHARED, module_object,
       "SECTION_MEM_SHARED");
   set_integer(
-      SECTION_MEM_EXECUTE, module_object,
+      IMAGE_SCN_MEM_EXECUTE, module_object,
       "SECTION_MEM_EXECUTE");
   set_integer(
-      SECTION_MEM_READ, module_object,
+      IMAGE_SCN_MEM_READ, module_object,
       "SECTION_MEM_READ");
   set_integer(
-      SECTION_MEM_WRITE, module_object,
+      IMAGE_SCN_MEM_WRITE, module_object,
       "SECTION_MEM_WRITE");
 
   set_integer(

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