windows test pass

Author: 4ra1n

CHANGELOG.MD

@@ -20,4 +20,10 @@ GUI 版本的使用和 CLI 版本基本一致，具体参考 README 文件
 
 ## 0.2
 
-- todo
+更新日志：
+- 基于`gcc`和`nasm`支持`linux x86_64 (amd64)`
+- 使用`execstack`为`so`库修改堆栈可执行属性
+- 汇编中部分寄存器忘记恢复状态导致某些`JVM`崩溃
+- 修改`README`部分应该使用`-agentpath`启动
+- 优化重构`Java`层代码，抽出工具类等
+- 避免重复宏定义的问题

native/CMakeLists.txt

@@ -93,12 +93,18 @@ if (WIN32)
     add_executable(
             decrypt_test
             core_de.h
+            core_en.h
             decrypt_test.c
     )
 
     target_link_libraries(decrypt_test
             PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/native_decrypt_asm.obj
-    )
+            )
+
+    target_link_libraries(decrypt_test
+            PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/native_encrypt_asm.obj
+            )
+
 else ()
     MESSAGE("THIS IS LINUX")
 
@@ -172,6 +178,7 @@ else ()
     add_executable(
             decrypt_test
             core_de.h
+            core_en.h
             decrypt_test.c
     )
 

native/start.c

@@ -75,7 +75,7 @@ void JNICALL ClassDecryptHook(
 }
 
 JNIEXPORT void JNICALL Agent_OnUnload(JavaVM *vm) {
-    LOG("UNLOAD AGENT");
+    DE_LOG("UNLOAD AGENT");
 }
 
 JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
@@ -109,7 +109,7 @@ JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
     }
 
     if (value == NULL) {
-        LOG("NEED PACKAGE_NAME PARAMS\n");
+        DE_LOG("NEED PACKAGE_NAME PARAMS\n");
         return 0;
     }
 
@@ -121,44 +121,44 @@ JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
     printf("PACKAGE-LENGTH: %llu\n", strlen(PACKAGE_NAME));
 
     jvmtiEnv *jvmti;
-    LOG("INIT JVMTI ENVIRONMENT");
+    DE_LOG("INIT JVMTI ENVIRONMENT");
     jint ret = (*vm)->GetEnv(vm, (void **) &jvmti, JVMTI_VERSION);
     if (JNI_OK != ret) {
         printf("ERROR: Unable to access JVMTI!\n");
         printf("PLEASE USE JVM VERSION 8");
         return ret;
     }
-    LOG("INIT JVMTI CAPABILITIES");
+    DE_LOG("INIT JVMTI CAPABILITIES");
     jvmtiCapabilities capabilities;
     (void) memset(&capabilities, 0, sizeof(capabilities));
 
     capabilities.can_generate_all_class_hook_events = 1;
 
-    LOG("ADD JVMTI CAPABILITIES");
+    DE_LOG("ADD JVMTI CAPABILITIES");
     jvmtiError error = (*jvmti)->AddCapabilities(jvmti, &capabilities);
     if (JVMTI_ERROR_NONE != error) {
         printf("ERROR: Unable to AddCapabilities JVMTI!\n");
         return error;
     }
 
-    LOG("INIT JVMTI CALLBACKS");
+    DE_LOG("INIT JVMTI CALLBACKS");
     jvmtiEventCallbacks callbacks;
     (void) memset(&callbacks, 0, sizeof(callbacks));
 
-    LOG("SET JVMTI CLASS FILE LOAD HOOK");
+    DE_LOG("SET JVMTI CLASS FILE LOAD HOOK");
     callbacks.ClassFileLoadHook = &ClassDecryptHook;
     error = (*jvmti)->SetEventCallbacks(jvmti, &callbacks, sizeof(callbacks));
     if (JVMTI_ERROR_NONE != error) {
         printf("ERROR: Unable to SetEventCallbacks JVMTI!\n");
         return error;
     }
-    LOG("SET EVENT NOTIFICATION MODE");
+    DE_LOG("SET EVENT NOTIFICATION MODE");
     error = (*jvmti)->SetEventNotificationMode(jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL);
     if (JVMTI_ERROR_NONE != error) {
         printf("ERROR: Unable to SetEventNotificationMode JVMTI!\n");
         return error;
     }
 
-    LOG("INIT JVMTI SUCCESS");
+    DE_LOG("INIT JVMTI SUCCESS");
     return JNI_OK;
 }