server: load_key: Support ASCII-armored key file
This commit is contained in:
@@ -5,7 +5,7 @@ use std::path::Path;
|
||||
use std::str::FromStr;
|
||||
use std::sync::Arc;
|
||||
|
||||
use age::armor::{ArmoredWriter, Format};
|
||||
use age::armor::{ArmoredReader, ArmoredWriter, Format};
|
||||
use age::ssh::Recipient;
|
||||
use age::x25519::Identity;
|
||||
use age::{Decryptor, Encryptor};
|
||||
@@ -237,7 +237,7 @@ fn load_key(
|
||||
}
|
||||
};
|
||||
if let Some(key) = key {
|
||||
let dec = match Decryptor::new(&keystr[..]) {
|
||||
let dec = match Decryptor::new(ArmoredReader::new(&keystr[..])) {
|
||||
Ok(d) => match d {
|
||||
Decryptor::Recipients(d) => d,
|
||||
_ => {
|
||||
|
||||
Reference in New Issue
Block a user