Mess with build parameters to make component binary smaller

core-modules/client/.cargo/config.toml

@@ -0,0 +1,3 @@
+[unstable]
+build-std = ["core", "std"]
+build-std-features = ["optimize_for_size"]

core-modules/client/Cargo.toml

@@ -1,4 +1,4 @@
-cargo-features = ["trim-paths"]
+cargo-features = ["trim-paths", "panic-immediate-abort"]
 
 [package]
 name = "client"
@@ -21,6 +21,6 @@ strip = true # Strip symbols from the binary
 opt-level = "s"  # Optimize for size
 lto = true
 codegen-units = 1
-panic = "abort"
+panic = "immediate-abort"
 debug = false
 trim-paths = "all"

core-modules/client/build.sh

@@ -0,0 +1,24 @@
+OBFUSCATION_KEY=abc123abc \
+cargo build --release
+
+export BINARY=./target/release/libclient.so
+
+
+declare -a headers=(
+    ".gnu_debuglink" # - Debug information link
+    ".comment" #- Compiler version info
+    ".shstrtab" #- Section header string table (only needed by tools like readelf)
+    ".note.gnu.bu" ".note.gnu.build-id" # - Build ID note
+    ".eh_frame" ".eh_frame_hdr" # Exception handling info (can break C++ exceptions if removed)
+    ".gnu.version" ".gnu.version_r" # Symbol versioning (may be needed for some shared libraries)
+    ".gnu.hash" # Hash table for symbol lookup optimization
+)
+
+# TODO: Implement FAKE section header comments and information
+# Shuffle order of headers??
+
+for section in "${headers[@]}"
+do
+    strip --remove-section="$section" $BINARY
+    echo "Removed section header $section"
+done

core-modules/client/src/lib.rs

@@ -58,10 +58,11 @@ fn start_runtime(config: &'static RuntimeConfig) -> Result<Box<dyn ModuleRuntime
     Ok(Box::new(ClientRuntime::new(config)?))
 }
 
-pub const fn get_named_component() -> NamedComponent {
-    NamedComponent {
+#[unsafe(no_mangle)]
+pub fn get_components() -> Vec<NamedComponent> {
+    vec![NamedComponent {
         name: MODULE_NAME,
         get_interface: &get_interface,
         start_runtime: &start_runtime,
-    }
+    }]
 }

core-modules/server/.cargo/config.toml

@@ -0,0 +1,3 @@
+[unstable]
+build-std = ["core", "std"]
+build-std-features = ["optimize_for_size"]

core-modules/server/Cargo.toml

@@ -1,4 +1,4 @@
-cargo-features = ["trim-paths"]
+cargo-features = ["trim-paths", "panic-immediate-abort"]
 
 [package]
 name = "server"
@@ -20,6 +20,6 @@ strip = true # Strip symbols from the binary
 opt-level = "s"  # Optimize for size
 lto = true
 codegen-units = 1
-panic = "abort"
+panic = "immediate-abort"
 debug = false
 trim-paths = "all"

core-modules/server/build.sh

@@ -1,7 +1,24 @@
 OBFUSCATION_KEY=abc123abc \
-RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" \
-cargo +nightly bloat \
-  -Z build-std=std,panic_abort \
-  -Z build-std-features="optimize_for_size" \
-  $@ \
-  --profile release
+cargo build --release
+
+export BINARY=./target/release/libserver.so
+
+
+declare -a headers=(
+    ".gnu_debuglink" # - Debug information link
+    ".comment" #- Compiler version info
+    ".shstrtab" #- Section header string table (only needed by tools like readelf)
+    ".note.gnu.bu" ".note.gnu.build-id" # - Build ID note
+    ".eh_frame" ".eh_frame_hdr" # Exception handling info (can break C++ exceptions if removed)
+    ".gnu.version" ".gnu.version_r" # Symbol versioning (may be needed for some shared libraries)
+    ".gnu.hash" # Hash table for symbol lookup optimization
+)
+
+// TODO: Implement FAKE section header comments and information
+// Shuffle order of headers??
+
+for section in "${headers[@]}"
+do
+    strip --remove-section="$section" $BINARY
+    echo "Removed section header $section"
+done

unshell-lib/Cargo.lock

@@ -494,9 +494,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea"
 
 [[package]]
 name = "scopeguard"

unshell-lib/Cargo.toml

@@ -23,6 +23,7 @@ chrono = "0.4.42"
 
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.145"
+
 libc = "0.2.177"
 rand = "0.9.2"
 crossbeam-channel = "0.5.15"

unshell-lib/src/announcement.rs

@@ -6,12 +6,11 @@ use crate::config::RuntimeConfig;
 #[derive(Clone, Debug, Encode, Decode)]
 pub enum Announcement {
     TestAnnouncement(String),
+    // GetRuntimes,
+    // GetRuntimesAck(usize),
 
-    GetRuntimes,
-    GetRuntimesAck(usize),
-
-    StartRuntime(RuntimeConfig),
-    StartRuntimeAck(bool),
+    // StartRuntime(RuntimeConfig),
+    // StartRuntimeAck(bool),
 }
 
 const BINCODE_CONFIG: bincode::config::Configuration = bincode::config::standard();

unshell-lib/src/config/mod.rs

@@ -21,7 +21,7 @@ pub struct PayloadConfig {
     pub runtime_config: Vec<RuntimeConfig>,
 }
 
-#[derive(Debug, Clone, Encode, Decode)]
+#[derive(Debug, Clone)]
 pub struct RuntimeConfig {
     pub parent_component: String,
     pub name: String,

unshell-payload/Cargo.lock

@@ -667,6 +667,8 @@ version = "0.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
+ "rand",
+ "static_init",
  "syn 2.0.109",
  "unshell-crypt",
 ]

unshell-payload/build.sh

@@ -7,4 +7,5 @@ RUSTFLAGS="-Zlocation-detail=none -Zfmt-debug=none" \
 cargo +nightly build \
   -Z build-std=std,panic_abort \
   -Z build-std-features="optimize_for_size" \
-  --profile release $@
+  $@ \
+  --profile release

unshell-payload/src/main.rs

@@ -16,7 +16,7 @@ extern crate unshell_lib;
 #[dynamic]
 static PAYLOAD_CONFIG: PayloadConfig = PayloadConfig {
     id: symbol!("Test ID"),
-    components: unshell_lib::get_components(),
+    components: Vec::new(),
     runtime_config: vec![RuntimeConfig {
         parent_component: symbol!("client").to_string(),
         name: symbol!("client runtime").to_string(),
@@ -52,6 +52,8 @@ fn main() {
         //     // modules.push(Module::new(&arg)?)
         // }
 
+        // let modules = vec
+
         // Run the manager, this is blocking.
         let manager = Manager::start(&PAYLOAD_CONFIG, Vec::new());