From ddb5356619f53604ae5cb55eb4ae576e1284827f Mon Sep 17 00:00:00 2001
From: se2crid <151872490+se2crid@users.noreply.github.com>
Date: Thu, 29 Jan 2026 19:23:08 +0100
Subject: [PATCH 1/2] chore: remove dependency on aws-lc-rs

---
 Cargo.lock                                | 97 -----------------------
 Cargo.toml                                |  5 +-
 apps/plumeimpactor/Cargo.toml             |  2 +-
 apps/plumeimpactor/src/main.rs            |  2 +-
 apps/plumeimpactor/src/screen/utilties.rs |  4 +-
 apps/plumesign/Cargo.toml                 |  2 +-
 crates/plume_core/Cargo.toml              |  2 +-
 7 files changed, 8 insertions(+), 106 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 686f2162..2bb65e49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -811,29 +811,6 @@ dependencies = [
  "arrayvec",
 ]
 
-[[package]]
-name = "aws-lc-rs"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b8ff6c09cd57b16da53641caa860168b88c172a5ee163b0288d3d6eea12786"
-dependencies = [
- "aws-lc-sys",
- "zeroize",
-]
-
-[[package]]
-name = "aws-lc-sys"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e44d16778acaf6a9ec9899b92cebd65580b83f685446bf2e1f5d3d732f99dcd"
-dependencies = [
- "bindgen",
- "cc",
- "cmake",
- "dunce",
- "fs_extra",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.75"
@@ -889,26 +866,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.72.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
-dependencies = [
- "bitflags 2.9.4",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 2.1.1",
- "shlex",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -1210,15 +1167,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom 7.1.3",
-]
-
 [[package]]
 name = "cfb"
 version = "0.7.3"
@@ -1276,17 +1224,6 @@ dependencies = [
  "inout",
 ]
 
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.8.8",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.49"
@@ -1366,15 +1303,6 @@ dependencies = [
  "x11rb",
 ]
 
-[[package]]
-name = "cmake"
-version = "0.1.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "cms"
 version = "0.2.3"
@@ -2136,12 +2064,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
@@ -2553,12 +2475,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -5868,16 +5784,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
-[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "primeorder"
 version = "0.13.6"
@@ -6668,8 +6574,6 @@ version = "0.23.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
 dependencies = [
- "aws-lc-rs",
- "log",
  "once_cell",
  "ring 0.17.14",
  "rustls-pki-types",
@@ -6747,7 +6651,6 @@ version = "0.103.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb"
 dependencies = [
- "aws-lc-rs",
  "ring 0.17.14",
  "rustls-pki-types",
  "untrusted 0.9.0",
diff --git a/Cargo.toml b/Cargo.toml
index 39e42d79..b6866575 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,8 +31,9 @@ incremental = true          # Improves re-compile times
 [workspace.dependencies]
 tokio = { version = "1.43", features = ["full"] }
 # Application
-idevice = { git = "https://github.com/PlumeImpactor/plume-idevice", rev = "5e350a", features = [
-    "full"
+idevice = { git = "https://github.com/PlumeImpactor/plume-idevice", rev = "5e350a", default-features = false, features = [
+    "full",
+    "ring",
 ] }
 plist = "1.8.0"
 
diff --git a/apps/plumeimpactor/Cargo.toml b/apps/plumeimpactor/Cargo.toml
index 2dca7108..7288dfd5 100644
--- a/apps/plumeimpactor/Cargo.toml
+++ b/apps/plumeimpactor/Cargo.toml
@@ -22,7 +22,7 @@ plume_store = { path = "../../crates/plume_store" }
 # TODO: move to workspace
 chrono = { version = "0.4.42", features = ["serde"] }
 
-rustls = { version = "0.23.32", features = ["ring"] }
+rustls = { version = "0.23.32", default-features = false, features = ["std", "tls12", "ring"] }
 
 iced = { version = "0.14.0", features = ["image", "advanced"] }
 tray-icon = { version = "0.21.2", default-features = false }
diff --git a/apps/plumeimpactor/src/main.rs b/apps/plumeimpactor/src/main.rs
index 22a8323f..d2cd679f 100644
--- a/apps/plumeimpactor/src/main.rs
+++ b/apps/plumeimpactor/src/main.rs
@@ -9,8 +9,8 @@ mod appearance;
 mod defaults;
 mod refresh;
 mod screen;
-mod subscriptions;
 mod startup;
+mod subscriptions;
 mod tray;
 
 pub const APP_NAME: &str = "Impactor";
diff --git a/apps/plumeimpactor/src/screen/utilties.rs b/apps/plumeimpactor/src/screen/utilties.rs
index 44f4f6ad..09c64b2a 100644
--- a/apps/plumeimpactor/src/screen/utilties.rs
+++ b/apps/plumeimpactor/src/screen/utilties.rs
@@ -314,8 +314,6 @@ impl UtilitiesScreen {
     }
 
     fn app_key(app: &SignerAppReal) -> String {
-        app.bundle_id
-            .clone()
-            .unwrap_or_else(|| app.app.to_string())
+        app.bundle_id.clone().unwrap_or_else(|| app.app.to_string())
     }
 }
diff --git a/apps/plumesign/Cargo.toml b/apps/plumesign/Cargo.toml
index 295f94ca..618ae2d2 100644
--- a/apps/plumesign/Cargo.toml
+++ b/apps/plumesign/Cargo.toml
@@ -17,7 +17,7 @@ plume_core = { path = "../../crates/plume_core", features = ["tweaks"] }
 plume_utils = { path = "../../crates/plume_types" }
 plume_store = { path = "../../crates/plume_store" }
 
-rustls = { version = "0.23.32", features = ["ring"] }
+rustls = { version = "0.23.32", default-features = false, features = ["std", "tls12", "ring"] }
 
 clap = { version = "4.5", features = ["derive"] }
 dialoguer = "0.12.0"
diff --git a/crates/plume_core/Cargo.toml b/crates/plume_core/Cargo.toml
index 7c45deb9..31ab9b01 100644
--- a/crates/plume_core/Cargo.toml
+++ b/crates/plume_core/Cargo.toml
@@ -19,7 +19,7 @@ log.workspace = true
 # Core dependencies
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
-rustls = { version = "0.23.32", features = ["ring"] }
+rustls = { version = "0.23.32", default-features = false, features = ["std", "tls12", "ring"] }
 reqwest = { version = "0.11.14", features = ["blocking", "json", "default-tls"] }
 regex = "1.11.2"
 base64 = "0.22"

From fd1910cb0078bf8e557bfc04cec708516c781c46 Mon Sep 17 00:00:00 2001
From: se2crid <151872490+se2crid@users.noreply.github.com>
Date: Thu, 29 Jan 2026 19:32:40 +0100
Subject: [PATCH 2/2] chore: drop openssl/native-tls by switching plume_core
 reqwest to rustls

---
 Cargo.lock                   | 108 +----------------------------------
 crates/plume_core/Cargo.toml |   2 +-
 2 files changed, 4 insertions(+), 106 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2bb65e49..d6f627ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1465,7 +1465,7 @@ dependencies = [
  "bitflags 1.3.2",
  "core-foundation 0.9.4",
  "core-graphics-types 0.1.3",
- "foreign-types 0.5.0",
+ "foreign-types",
  "libc",
 ]
 
@@ -2424,15 +2424,6 @@ dependencies = [
  "ttf-parser",
 ]
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -2440,7 +2431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared 0.3.1",
+ "foreign-types-shared",
 ]
 
 [[package]]
@@ -2454,12 +2445,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -3269,19 +3254,6 @@ dependencies = [
  "webpki-roots 1.0.3",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper 0.14.32",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "hyper-util"
 version = "0.1.17"
@@ -4272,7 +4244,7 @@ dependencies = [
  "bitflags 2.9.4",
  "block",
  "core-graphics-types 0.2.0",
- "foreign-types 0.5.0",
+ "foreign-types",
  "log",
  "objc",
  "paste",
@@ -4418,23 +4390,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework 2.11.1",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "ndk"
 version = "0.9.0"
@@ -5142,50 +5097,12 @@ dependencies = [
  "pathdiff",
 ]
 
-[[package]]
-name = "openssl"
-version = "0.10.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
-dependencies = [
- "bitflags 2.9.4",
- "cfg-if",
- "foreign-types 0.3.2",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
-[[package]]
-name = "openssl-sys"
-version = "0.9.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -6337,12 +6254,10 @@ dependencies = [
  "http-body 0.4.6",
  "hyper 0.14.32",
  "hyper-rustls 0.24.2",
- "hyper-tls",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -6354,7 +6269,6 @@ dependencies = [
  "sync_wrapper 0.1.2",
  "system-configuration",
  "tokio",
- "tokio-native-tls",
  "tokio-rustls 0.24.1",
  "tokio-util",
  "tower-service",
@@ -7655,16 +7569,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.24.1"
@@ -8139,12 +8043,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "version-compare"
 version = "0.2.1"
diff --git a/crates/plume_core/Cargo.toml b/crates/plume_core/Cargo.toml
index 31ab9b01..df50cce0 100644
--- a/crates/plume_core/Cargo.toml
+++ b/crates/plume_core/Cargo.toml
@@ -20,7 +20,7 @@ log.workspace = true
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
 rustls = { version = "0.23.32", default-features = false, features = ["std", "tls12", "ring"] }
-reqwest = { version = "0.11.14", features = ["blocking", "json", "default-tls"] }
+reqwest = { version = "0.11.14", default-features = false, features = ["blocking", "json", "rustls-tls"] }
 regex = "1.11.2"
 base64 = "0.22"
 hex = "0.4.3"