dustin
/
keyserv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server: load_key: Support ASCII-armored key file

master
Dustin 2024-01-10 14:52:25 -06:00
parent 0355e24e23
commit d6e7abf046
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server.rs
View File

@ -5,7 +5,7 @@ use std::path::Path;
use std::str::FromStr; use std::str::FromStr;
use std::sync::Arc; use std::sync::Arc;
use age::armor::{ArmoredWriter, Format}; use age::armor::{ArmoredReader, ArmoredWriter, Format};
use age::ssh::Recipient; use age::ssh::Recipient;
use age::x25519::Identity; use age::x25519::Identity;
use age::{Decryptor, Encryptor}; use age::{Decryptor, Encryptor};
@ -237,7 +237,7 @@ fn load_key(
} }
}; };
if let Some(key) = key { if let Some(key) = key {
let dec = match Decryptor::new(&keystr[..]) { let dec = match Decryptor::new(ArmoredReader::new(&keystr[..])) {
Ok(d) => match d { Ok(d) => match d {
Decryptor::Recipients(d) => d, Decryptor::Recipients(d) => d,
_ => { _ => {