From d6e7abf046cbe515662176bd16eeb094bb09f8c8 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Wed, 10 Jan 2024 14:52:25 -0600 Subject: [PATCH] server: load_key: Support ASCII-armored key file --- src/server.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server.rs b/src/server.rs index e75bb7e..94d11ab 100644 --- a/src/server.rs +++ b/src/server.rs @@ -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, _ => {