From daa4f8c748d290feba8a71e889743a8a3097ad7d Mon Sep 17 00:00:00 2001 From: Amlal Date: Wed, 25 Sep 2024 08:26:08 +0200 Subject: Refactor codebase: Move Objects to obj/, fix flags, remove .vscode, add syscalls - Refactored Objects directory to obj/ for better organization. - Fixed incorrect flags in the build process. - Removed .vscode folder to clean up unnecessary IDE settings. - Added syscall implementations for enhanced functionality. Signed-off-by: Amlal --- dev/base/EncryptFS/EncryptFS.hxx | 22 ---------------------- dev/base/EncryptFS/ReadMe.md | 8 +++++++- dev/base/EncryptFS/build.json | 2 +- dev/base/EncryptFS/disk_crypt.hxx | 28 ++++++++++++++++++++++++++++ dev/base/EncryptFS/source_deploy.xml | 5 ----- dev/base/EncryptFS/src/EncryptBlock.cxx | 14 -------------- dev/base/EncryptFS/src/Key.cxx | 12 ------------ dev/base/EncryptFS/src/disk_crypt.cxx | 14 ++++++++++++++ dev/base/ReadMe.md | 2 ++ dev/base/RunDLL64/build.json | 2 +- dev/base/RunDLL64/src/LauncherMain.cxx | 22 ---------------------- dev/base/RunDLL64/src/dll.cxx | 22 ++++++++++++++++++++++ dev/base/RunXPCOM/build.json | 2 +- dev/base/RunXPCOM/src/LauncherMain.cxx | 28 ---------------------------- dev/base/RunXPCOM/src/xpcom.cxx | 28 ++++++++++++++++++++++++++++ 15 files changed, 104 insertions(+), 107 deletions(-) delete mode 100644 dev/base/EncryptFS/EncryptFS.hxx create mode 100644 dev/base/EncryptFS/disk_crypt.hxx delete mode 100644 dev/base/EncryptFS/source_deploy.xml delete mode 100644 dev/base/EncryptFS/src/EncryptBlock.cxx delete mode 100644 dev/base/EncryptFS/src/Key.cxx create mode 100644 dev/base/EncryptFS/src/disk_crypt.cxx delete mode 100644 dev/base/RunDLL64/src/LauncherMain.cxx create mode 100644 dev/base/RunDLL64/src/dll.cxx delete mode 100644 dev/base/RunXPCOM/src/LauncherMain.cxx create mode 100644 dev/base/RunXPCOM/src/xpcom.cxx (limited to 'dev/base') diff --git a/dev/base/EncryptFS/EncryptFS.hxx b/dev/base/EncryptFS/EncryptFS.hxx deleted file mode 100644 index 368df9ae..00000000 --- a/dev/base/EncryptFS/EncryptFS.hxx +++ /dev/null @@ -1,22 +0,0 @@ -/* ------------------------------------------- - - Copyright ZKA Technologies. - - File: Encrypt.hxx - Purpose: Encrypted File System - - Revision History: - - 8/8/2024: Added file (amlel) - -------------------------------------------- */ - -#pragma once - -#include - -namespace EncryptFS -{ - using namespace Kernel; - -} \ No newline at end of file diff --git a/dev/base/EncryptFS/ReadMe.md b/dev/base/EncryptFS/ReadMe.md index 69968538..e84670cc 100644 --- a/dev/base/EncryptFS/ReadMe.md +++ b/dev/base/EncryptFS/ReadMe.md @@ -1,5 +1,11 @@ # ZKA Encrypted File System. -This is ZKA's Encrypted file system DLL. +### Purpose: + +This is ZKA's Encrypted File System DLL. + +### Building: + +`btb build.json` ###### (c) ZKA Technologies, all rights reserved. diff --git a/dev/base/EncryptFS/build.json b/dev/base/EncryptFS/build.json index efb86ab3..3b41b059 100644 --- a/dev/base/EncryptFS/build.json +++ b/dev/base/EncryptFS/build.json @@ -3,7 +3,7 @@ "compiler_std": "c++20", "headers_path": ["../", "./"], "sources_path": ["src/*.cxx"], - "output_name": "encryptfs.dll", + "output_name": "efs.sys", "compiler_flags": [ "-ffreestanding", "-shared", diff --git a/dev/base/EncryptFS/disk_crypt.hxx b/dev/base/EncryptFS/disk_crypt.hxx new file mode 100644 index 00000000..0b80a930 --- /dev/null +++ b/dev/base/EncryptFS/disk_crypt.hxx @@ -0,0 +1,28 @@ +/* ------------------------------------------- + + Copyright ZKA Technologies. + + File: Encrypt.hxx + Purpose: Encrypted File System + + Revision History: + + 8/8/2024: Added file (amlel) + +------------------------------------------- */ + +#pragma once + +#include + +/**************************************** */ +/// @brief Locks an EFS partition. +/**************************************** */ + +Kernel::Int32 efs_lock_partition(Kernel::Char* partition_name, Kernel::Char* password, Kernel::Size length); + +/**************************************** */ +/// @brief Unlocks an EFS partition. +/**************************************** */ + +Kernel::Int32 efs_unlock_partition(Kernel::Char* partition_name, Kernel::Char* password, Kernel::Size length); diff --git a/dev/base/EncryptFS/source_deploy.xml b/dev/base/EncryptFS/source_deploy.xml deleted file mode 100644 index 01bd14cd..00000000 --- a/dev/base/EncryptFS/source_deploy.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - src/*.cxx - - diff --git a/dev/base/EncryptFS/src/EncryptBlock.cxx b/dev/base/EncryptFS/src/EncryptBlock.cxx deleted file mode 100644 index b3f2fc56..00000000 --- a/dev/base/EncryptFS/src/EncryptBlock.cxx +++ /dev/null @@ -1,14 +0,0 @@ -/* ------------------------------------------- - - Copyright ZKA Technologies. - -------------------------------------------- */ - -#include -#include - -enum -{ - eEFSFlagEncrypted = 0x3f, - eEFSFlagEncryptedEPM = 0xf3, -}; diff --git a/dev/base/EncryptFS/src/Key.cxx b/dev/base/EncryptFS/src/Key.cxx deleted file mode 100644 index 166d04b3..00000000 --- a/dev/base/EncryptFS/src/Key.cxx +++ /dev/null @@ -1,12 +0,0 @@ -/* ------------------------------------------- - - Copyright ZKA Technologies. - -------------------------------------------- */ - -#include -#include -#include - -typedef int32_t efs_encrypt_token_t; -typedef void* efs_encrypted_blob_t; diff --git a/dev/base/EncryptFS/src/disk_crypt.cxx b/dev/base/EncryptFS/src/disk_crypt.cxx new file mode 100644 index 00000000..e8d64bfe --- /dev/null +++ b/dev/base/EncryptFS/src/disk_crypt.cxx @@ -0,0 +1,14 @@ +/* ------------------------------------------- + + Copyright ZKA Technologies. + +------------------------------------------- */ + +#include + +enum +{ + eEFSFlagEncryptedFree = 0x00, + eEFSFlagEncryptedUnlock = 0x3f, + eEFSFlagEncryptedLock = 0xf3, +}; diff --git a/dev/base/ReadMe.md b/dev/base/ReadMe.md index df73d757..46443aea 100644 --- a/dev/base/ReadMe.md +++ b/dev/base/ReadMe.md @@ -1,5 +1,7 @@ # ZKA User DLLs/Programs. +## Description: + - Used to provide features to a program from the sci.dll. ###### Copyright ZKA Technologies, all rights reserved. diff --git a/dev/base/RunDLL64/build.json b/dev/base/RunDLL64/build.json index a69dbb11..c53373a9 100644 --- a/dev/base/RunDLL64/build.json +++ b/dev/base/RunDLL64/build.json @@ -8,7 +8,7 @@ "-ffreestanding", "-fno-rtti", "-fno-exceptions", - " -Wl,--subsystem=17" + "-Wl,--subsystem=17" ], "cpp_macros": [ "__RUNDLL_AMD64__", diff --git a/dev/base/RunDLL64/src/LauncherMain.cxx b/dev/base/RunDLL64/src/LauncherMain.cxx deleted file mode 100644 index ed1ab65c..00000000 --- a/dev/base/RunDLL64/src/LauncherMain.cxx +++ /dev/null @@ -1,22 +0,0 @@ -#include - -typedef int (*MainKind)(int, char**); - -int WinMain(int argc, char* argv[]) -{ - if (argc < 3) - return -1; - - auto mainDll = LdrOpenDLL(argv[1], argv[2]); - - int (*entrypointOff)(int, char**) = (MainKind)LdrGetDLLProc(argv[3], mainDll); - - if (!entrypointOff) - return -1; - - int ret = entrypointOff(argc, argv); - - LdrCloseDLL(mainDll); - - return ret; -} diff --git a/dev/base/RunDLL64/src/dll.cxx b/dev/base/RunDLL64/src/dll.cxx new file mode 100644 index 00000000..560a404d --- /dev/null +++ b/dev/base/RunDLL64/src/dll.cxx @@ -0,0 +1,22 @@ +#include + +typedef int (*MainKind)(int, char**); + +int main(int argc, char* argv[]) +{ + if (argc < 3) + return -1; + + auto mainDll = LdrOpenDLL(argv[1], argv[2]); + + int (*entrypointOff)(int, char**) = (MainKind)LdrGetDLLProc(argv[3], mainDll); + + if (!entrypointOff) + return -1; + + int ret = entrypointOff(argc, argv); + + LdrCloseDLL(mainDll); + + return ret; +} diff --git a/dev/base/RunXPCOM/build.json b/dev/base/RunXPCOM/build.json index a932d733..45d249b8 100644 --- a/dev/base/RunXPCOM/build.json +++ b/dev/base/RunXPCOM/build.json @@ -8,7 +8,7 @@ "-ffreestanding", "-fno-rtti", "-fno-exceptions", - " -Wl,--subsystem=17" + "-Wl,--subsystem=17" ], "cpp_macros": [ "__SCM_AMD64__", diff --git a/dev/base/RunXPCOM/src/LauncherMain.cxx b/dev/base/RunXPCOM/src/LauncherMain.cxx deleted file mode 100644 index b6047435..00000000 --- a/dev/base/RunXPCOM/src/LauncherMain.cxx +++ /dev/null @@ -1,28 +0,0 @@ -#include - -typedef SInt32 (*RPCProcKind)(IUnknown*); - -/** - * @brief Main procedure for DLL runner. - */ -int WinMain(int argc, char* argv[]) -{ - if (argc < 4) - return -1; - - auto mainDll = LdrOpenDLL(argv[1], argv[2]); - - IUnknown* interface = (IUnknown*)LdrGetDLLProc(argv[3], mainDll); - RPCProcKind dllRpc = (RPCProcKind)LdrGetDLLProc(argv[4], mainDll); - - if (!dllRpc) - return -1; - if (!interface) - return -1; - - auto ret = dllRpc(interface); - - LdrCloseDLL(mainDll); - - return ret; -} diff --git a/dev/base/RunXPCOM/src/xpcom.cxx b/dev/base/RunXPCOM/src/xpcom.cxx new file mode 100644 index 00000000..9536b070 --- /dev/null +++ b/dev/base/RunXPCOM/src/xpcom.cxx @@ -0,0 +1,28 @@ +#include + +typedef SInt32 (*RPCProcKind)(IUnknown*); + +/** + * @brief Main procedure for DLL runner. + */ +int main(int argc, char* argv[]) +{ + if (argc < 4) + return -1; + + auto mainDll = LdrOpenDLL(argv[1], argv[2]); + + IUnknown* interface = (IUnknown*)LdrGetDLLProc(argv[3], mainDll); + RPCProcKind dllRpc = (RPCProcKind)LdrGetDLLProc(argv[4], mainDll); + + if (!dllRpc) + return -1; + if (!interface) + return -1; + + auto ret = dllRpc(interface); + + LdrCloseDLL(mainDll); + + return ret; +} -- cgit v1.2.3