rixxc/age-plugin-xwing
1
0
Fork 0
mirror of https://github.com/Rixxc/age-plugin-xwing.git synced 2025-12-04 14:59:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: encode ciphertext using BASE64_STANDARD_NO_PAD

Browse Source
This commit is contained in:
Aaron Kaiser
2025-02-09 10:38:16 +01:00
parent 1b0e4180a0
commit a8eaf3be50
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -44,7 +44,7 @@ dependencies = [
[[package]] [[package]]
name = "age-plugin-xwing" name = "age-plugin-xwing"
version = "0.1.1" version = "0.2.0"
dependencies = [ dependencies = [
"age-core", "age-core",
"age-plugin", "age-plugin",

2
Cargo.toml
View File

@@ -1,7 +1,7 @@
[package] [package]
name = "age-plugin-xwing" name = "age-plugin-xwing"
description = "X-Wing plugin for age clients" description = "X-Wing plugin for age clients"
version = "0.1.1" version = "0.2.0"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
repository = "https://github.com/Rixxc/age-plugin-xwing" repository = "https://github.com/Rixxc/age-plugin-xwing"

14
src/main.rs
View File

@@ -56,7 +56,7 @@ impl RecipientPlugin {
let wrapped_key = aead_encrypt(&ss, file_key.expose_secret()); let wrapped_key = aead_encrypt(&ss, file_key.expose_secret());
Stanza { Stanza {
tag: PLUGIN_NAME.to_string(), tag: PLUGIN_NAME.to_string(),
args: vec![BASE64_STANDARD.encode(ct.as_bytes())], args: vec![BASE64_STANDARD_NO_PAD.encode(ct.as_bytes())],
body: wrapped_key, body: wrapped_key,
} }
}) })
@@ -166,9 +166,15 @@ impl IdentityPlugin {
} }
}; };
let ct = match BASE64_STANDARD.decode(arg) { // age-plugin-xwing up to version 0.1.1 encoded its ciphertext using BASE64_STANDARD.
Ok(ct) => ct, // We still want to be able to support decrypting those.
Err(_) => { let ct = match (
BASE64_STANDARD_NO_PAD.decode(arg),
BASE64_STANDARD.decode(arg),
) {
(Ok(ct), _) => ct,
(_, Ok(ct)) => ct,
_ => {
errors.push(identity::Error::Stanza { errors.push(identity::Error::Stanza {
file_index, file_index,
stanza_index, stanza_index,