v2.0.0. upgrade LIEF.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fib-inject",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "fibjs binding for inject representation and classification.",
   "main": "index.js",
   "scripts": {

src/format.cpp

@@ -4,21 +4,6 @@
 #include <LIEF/LIEF.hpp>
 #include "LIEF/BinaryStream/SpanStream.hpp"
 
-namespace LIEF {
-namespace ELF {
-    bool is_elf(BinaryStream& stream);
-}
-
-namespace PE {
-    bool is_pe(BinaryStream& stream);
-}
-
-namespace MachO {
-    bool is_macho(BinaryStream& stream);
-}
-
-}
-
 Napi::Value get_executable_format(const Napi::CallbackInfo& info)
 {
     Napi::Env env = info.Env();

src/inject_into_elf.cpp

@@ -29,7 +29,7 @@ Napi::Value inject_into_elf(const Napi::CallbackInfo& info)
     }
 
     LIEF::ELF::ARCH machine_type = binary->header().machine_type();
-    if (machine_type == LIEF::ELF::ARCH::EM_LOONGARCH || machine_type == LIEF::ELF::ARCH::EM_MIPS) {
+    if (machine_type == LIEF::ELF::ARCH::LOONGARCH || machine_type == LIEF::ELF::ARCH::MIPS) {
         result.Set("result", Napi::Number::New(env, InjectResult::kError));
         return result;
     }
@@ -52,16 +52,15 @@ Napi::Value inject_into_elf(const Napi::CallbackInfo& info)
         }
     }
 
-    // std::unique_ptr<LIEF::ELF::Note> note = LIEF::ELF::Note::create(note_name, LIEF::ELF::Note::TYPE::UNKNOWN,
-    //     std::vector<uint8_t>(data.Data(), data.Data() + data.ByteLength()));
-    // binary->add(*note);
+    std::unique_ptr<LIEF::ELF::Note> note = LIEF::ELF::Note::create(note_name, LIEF::ELF::Note::TYPE::GNU_BUILD_ATTRIBUTE_OPEN,
+        std::vector<uint8_t>(data.Data(), data.Data() + data.ByteLength()), "");
+    binary->add(*note);
 
-    LIEF::ELF::Note note;
-    note.name(note_name);
-    note.description(std::vector<uint8_t>(data.Data(), data.Data() + data.ByteLength()));
-    binary->add(note);
+    LIEF::ELF::Builder builder { *binary };
+    builder.config().notes = true;
+    builder.build();
+    std::vector<uint8_t> output = builder.get_build();
 
-    std::vector<uint8_t> output = binary->raw();
     Napi::Uint8Array output_data = Napi::Uint8Array::New(env, output.size());
     std::copy(output.begin(), output.end(), output_data.Data());
 

src/inject_into_macho.cpp

@@ -45,10 +45,8 @@ Napi::Value inject_into_macho(const Napi::CallbackInfo& info)
 
         if (!segment) {
             LIEF::MachO::SegmentCommand new_segment(segment_name);
-            // new_segment.max_protection(static_cast<uint32_t>(LIEF::MachO::SegmentCommand::VM_PROTECTIONS::READ));
-            // new_segment.init_protection(static_cast<uint32_t>(LIEF::MachO::SegmentCommand::VM_PROTECTIONS::READ));
-            new_segment.max_protection(static_cast<uint32_t>(LIEF::MachO::VM_PROTECTIONS::VM_PROT_READ));
-            new_segment.init_protection(static_cast<uint32_t>(LIEF::MachO::VM_PROTECTIONS::VM_PROT_READ));
+            new_segment.max_protection(static_cast<uint32_t>(LIEF::MachO::SegmentCommand::VM_PROTECTIONS::READ));
+            new_segment.init_protection(static_cast<uint32_t>(LIEF::MachO::SegmentCommand::VM_PROTECTIONS::READ));
             new_segment.add_section(section);
             binary.add(new_segment);
         } else {

src/inject_into_pe.cpp

@@ -42,16 +42,14 @@ Napi::Value inject_into_pe(const Napi::CallbackInfo& info)
     auto rcdata_node_iter = std::find_if(
         std::begin(resources->childs()), std::end(resources->childs()),
         [](const LIEF::PE::ResourceNode& node) {
-            // return node.id() == static_cast<uint32_t>(LIEF::PE::ResourcesManager::TYPE::RCDATA);
-            return node.id() == static_cast<uint32_t>(LIEF::PE::RESOURCE_TYPES::RCDATA);
+            return node.id() == static_cast<uint32_t>(LIEF::PE::ResourcesManager::TYPE::RCDATA);
         });
 
     if (rcdata_node_iter != std::end(resources->childs())) {
         rcdata_node = &*rcdata_node_iter;
     } else {
         LIEF::PE::ResourceDirectory new_rcdata_node;
-        // new_rcdata_node.id(static_cast<uint32_t>(LIEF::PE::ResourcesManager::TYPE::RCDATA));
-        new_rcdata_node.id(static_cast<uint32_t>(LIEF::PE::RESOURCE_TYPES::RCDATA));
+        new_rcdata_node.id(static_cast<uint32_t>(LIEF::PE::ResourcesManager::TYPE::RCDATA));
         rcdata_node = &resources->add_child(new_rcdata_node);
     }