base64: decode like dkl

This commit is contained in:
Mikaël Cluseau
2026-02-10 21:25:38 +01:00
parent 2e337f9957
commit 7b30eb4435
3 changed files with 3 additions and 5 deletions

3
Cargo.lock generated
View File

@ -327,7 +327,7 @@ dependencies = [
[[package]] [[package]]
name = "dkl" name = "dkl"
version = "1.0.0" version = "1.0.0"
source = "git+https://novit.tech/direktil/dkl#723cecff1b146f4ef8a8e3040508c0fcf02dfe96" source = "git+https://novit.tech/direktil/dkl#d2293df0112cb98e7b5e93dcb05cf8dbf1b05b56"
dependencies = [ dependencies = [
"async-compression", "async-compression",
"base32", "base32",
@ -943,7 +943,6 @@ dependencies = [
name = "init" name = "init"
version = "2.5.2" version = "2.5.2"
dependencies = [ dependencies = [
"base64",
"dkl", "dkl",
"env_logger", "env_logger",
"eyre", "eyre",

View File

@ -25,7 +25,6 @@ shell-escape = "0.1.5"
tokio = { version = "1.38.0", features = ["rt", "net", "fs", "process", "io-std", "io-util", "sync", "macros", "signal"] } tokio = { version = "1.38.0", features = ["rt", "net", "fs", "process", "io-std", "io-util", "sync", "macros", "signal"] }
termios = "0.3.3" termios = "0.3.3"
unix_mode = "0.1.4" unix_mode = "0.1.4"
base64 = "0.22.1"
sys-info = "0.9.1" sys-info = "0.9.1"
dkl = { git = "https://novit.tech/direktil/dkl", version = "1.0.0" } dkl = { git = "https://novit.tech/direktil/dkl", version = "1.0.0" }
openssl = "0.10.73" openssl = "0.10.73"

View File

@ -8,6 +8,7 @@ use tokio::{
use dkl::{ use dkl::{
self, self,
apply::{self, chroot, set_perms}, apply::{self, chroot, set_perms},
base64_decode,
bootstrap::Config, bootstrap::Config,
}; };
@ -89,8 +90,7 @@ impl Verifier {
return Ok(Self { pubkey: None }); return Ok(Self { pubkey: None });
}; };
use base64::{prelude::BASE64_STANDARD, Engine}; let pubkey = base64_decode(pubkey)?;
let pubkey = BASE64_STANDARD.decode(pubkey)?;
let pubkey = Some(pubkey); let pubkey = Some(pubkey);
return Ok(Self { pubkey }); return Ok(Self { pubkey });