Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,9 @@ jobs:
sudo apt-get update
sudo apt-get install -y libglib2.0-dev libsecret-1-dev libgtk-3-dev libpng-dev libjpeg-dev libgl1-mesa-dev libglu1-mesa-dev libxkbcommon-dev libexpat1-dev libtiff-dev

- name: Build Dependencies
run: |
cargo install patch-crate
cargo fetch --locked || true
cargo patch-crate --force
mkdir -p build/out

- name: Build Binary
run: |
mkdir -p build/out
cargo build --workspace --bins --locked --release
cp target/release/${{ env.BINARY_NAME_CLI }} build/out/${{ env.BINARY_NAME_CLI }}-linux-${{ matrix.arch }}

Expand Down Expand Up @@ -109,16 +103,10 @@ jobs:
- name: Setup Windows MSVC environment
uses: ilammy/msvc-dev-cmd@v1

- name: Build Dependencies
- name: Build & Bundle (Windows)
run: |
cargo install patch-crate
cargo fetch --locked || true
cargo patch-crate --force
mkdir -p build/out
mkdir -p build/nsis

- name: Build & Bundle (Windows)
run: |
cargo build --workspace --bins --locked --release
cp target/release/${{ env.BINARY_NAME }}.exe build/nsis
cp target/release/${{ env.BINARY_NAME_CLI }}.exe build/out/${{ env.BINARY_NAME_CLI }}-windows-x86_64.exe
Expand Down Expand Up @@ -155,15 +143,9 @@ jobs:
with:
targets: ${{ matrix.target }}

- name: Build Dependencies
run: |
cargo install patch-crate
cargo fetch --locked || true
cargo patch-crate --force
mkdir -p build/out

- name: Build (macOS ${{ matrix.arch }})
run: |
mkdir -p build/out
cargo build --workspace --bins --locked --release
strip target/release/${{ env.BINARY_NAME }}
strip target/release/${{ env.BINARY_NAME_CLI }}
Expand Down
16 changes: 7 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,3 @@ thiserror = "2.0.16"
# Utils
uuid = "1.18.1"
futures = "0.3.31"

[patch.crates-io]
srp = { path="./target/patch/srp-0.6.0" }
apple-codesign = { path="./target/patch/apple-codesign-0.29.0" }
7 changes: 4 additions & 3 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ hmac = "0.12.1"
pbkdf2 = "0.11"
sha1 = "0.10.6"
sha2 = "0.10.9"
srp = "0.6.0"
rsa = "0.9.8"
# Certificates
x509-certificate = "0.24.0"
Expand All @@ -42,9 +41,11 @@ pem-rfc7468 = "0.7.0"
rcgen = "0.9.3"
p12-keystore = "0.2.0" # TODO: look into p12 crate and why it doesnt support SHA256
# Apple
apple-codesign = { version = "0.29.0", default-features = false }
omnisette = { git = "https://github.com/PlumeImpactor/omnisette", rev = "c066ac2", package = "omnisette", features = ["remote-anisette-v3"] }
goblin = "0.9.3"
# Forks
apple-codesign = { git = "https://github.com/PlumeImpactor/plume-apple-platform-rs", rev = "428b42f", package = "apple-codesign", default-features = false }
omnisette = { git = "https://github.com/PlumeImpactor/omnisette", rev = "c066ac2", package = "omnisette", features = ["remote-anisette-v3"] }
srp = { git = "https://github.com/PlumeImpactor/plume-PAKEs", rev = "047936a", package = "srp" }

[features]
default = []
Expand Down
102 changes: 0 additions & 102 deletions patches/apple-codesign+0.29.0.patch

This file was deleted.

148 changes: 0 additions & 148 deletions patches/srp+0.6.0.patch

This file was deleted.