From 7b30eb44358fef0090b53427869e71b3f3b1b5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Cluseau?= Date: Tue, 10 Feb 2026 21:25:38 +0100 Subject: [PATCH] base64: decode like dkl --- Cargo.lock | 3 +-- Cargo.toml | 1 - src/cmd/init/bootstrap.rs | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ed541b..ecedcf1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -327,7 +327,7 @@ dependencies = [ [[package]] name = "dkl" version = "1.0.0" -source = "git+https://novit.tech/direktil/dkl#723cecff1b146f4ef8a8e3040508c0fcf02dfe96" +source = "git+https://novit.tech/direktil/dkl#d2293df0112cb98e7b5e93dcb05cf8dbf1b05b56" dependencies = [ "async-compression", "base32", @@ -943,7 +943,6 @@ dependencies = [ name = "init" version = "2.5.2" dependencies = [ - "base64", "dkl", "env_logger", "eyre", diff --git a/Cargo.toml b/Cargo.toml index a71fdf4..c294633 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] } termios = "0.3.3" unix_mode = "0.1.4" -base64 = "0.22.1" sys-info = "0.9.1" dkl = { git = "https://novit.tech/direktil/dkl", version = "1.0.0" } openssl = "0.10.73" diff --git a/src/cmd/init/bootstrap.rs b/src/cmd/init/bootstrap.rs index c5a019b..4dc1ec9 100644 --- a/src/cmd/init/bootstrap.rs +++ b/src/cmd/init/bootstrap.rs @@ -8,6 +8,7 @@ use tokio::{ use dkl::{ self, apply::{self, chroot, set_perms}, + base64_decode, bootstrap::Config, }; @@ -89,8 +90,7 @@ impl Verifier { return Ok(Self { pubkey: None }); }; - use base64::{prelude::BASE64_STANDARD, Engine}; - let pubkey = BASE64_STANDARD.decode(pubkey)?; + let pubkey = base64_decode(pubkey)?; let pubkey = Some(pubkey); return Ok(Self { pubkey });