myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix key regression introduced (#974)

Browse source
This commit is contained in:
Ellie Huxtable 2023-05-11 16:18:20 -04:00 committed by GitHub
parent bf7432f392
commit b53ca357cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
atuin-client/src/encryption.rs
View file

@ -85,10 +85,19 @@ pub fn decode_key(key: String) -> Result<Key> {
let buf = BASE64_STANDARD let buf = BASE64_STANDARD
.decode(key.trim_end()) .decode(key.trim_end())
.wrap_err("encryption key is not a valid base64 encoding")?; .wrap_err("encryption key is not a valid base64 encoding")?;
let mbuf: Result<[u8; 32]> =
rmp_serde::from_slice(&buf).wrap_err("encryption key is not a valid message pack encoding");
match mbuf {
Ok(b) => Ok(*Key::from_slice(&b)),
Err(_) => {
let buf: &[u8] = rmp_serde::from_slice(&buf) let buf: &[u8] = rmp_serde::from_slice(&buf)
.wrap_err("encryption key is not a valid message pack encoding")?; .wrap_err("encryption key is not a valid message pack encoding")?;
Ok(*Key::from_slice(buf)) Ok(*Key::from_slice(buf))
}
}
} }
pub fn encrypt(history: &History, key: &Key) -> Result<EncryptedHistory> { pub fn encrypt(history: &History, key: &Key) -> Result<EncryptedHistory> {