Skip to content

Commit 932c7ce

Browse files
committed
fix: re-add ALTCertificate bundling support
1 parent 87b5c63 commit 932c7ce

4 files changed

Lines changed: 255 additions & 42 deletions

File tree

Cargo.lock

Lines changed: 198 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/plumeimpactor/src/frame.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use grand_slam::auth::Account;
88
use grand_slam::developer::DeveloperSession;
99
use grand_slam::utils::{PlistInfoTrait};
1010
use idevice::utils::installation;
11+
use tokio::fs;
1112
use wxdragon::prelude::*;
1213

1314
use futures::StreamExt;
@@ -455,16 +456,16 @@ impl PlumeFrame {
455456
}
456457
}
457458

458-
// if signer_settings.should_embed_p12 {
459-
// if let Some(p12_data) = &cert_identity.p12_data {
460-
// if let Some(serial_number) = &cert_identity.serial_number {
461-
// bundle.set_info_plist_key("ALTCertificateID", &**serial_number)
462-
// .map_err(|e| format!("Failed to set cert serial: {}", e))?;
463-
// fs::write(bundle.dir().join("ALTCertificate.p12"), p12_data)
464-
// .map_err(|e| format!("Failed to write p12: {}", e))?;
465-
// }
466-
// }
467-
// }
459+
if signer_settings.should_embed_p12 {
460+
if let Some(p12_data) = &cert_identity.p12_data {
461+
if let Some(serial_number) = &cert_identity.serial_number {
462+
bundle.set_info_plist_key("ALTCertificateID", &**serial_number)
463+
.map_err(|e| format!("Failed to set cert serial: {}", e))?;
464+
fs::write(bundle.dir().join("ALTCertificate.p12"), p12_data)
465+
.await.map_err(|e| format!("Failed to write p12: {}", e))?;
466+
}
467+
}
468+
}
468469

469470
sender_clone.send(PlumeFrameMessage::InstallProgress(30, Some(format!("Registering {}...", bundle.get_name().unwrap_or_default())))).ok();
470471

crates/grand_slam/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ rcgen = "0.9.3"
4040
pem-rfc7468 = "0.7.0"
4141
rsa = "0.9.8"
4242
hex = "0.4.3"
43-
p12 = "0.6.3"
43+
# this dep sucks
44+
p12-keystore = "0.2.0"
4445

4546
[features]
4647
default = []

0 commit comments

Comments
 (0)