From abf83ecfa6f262a9e34e69bc03f3f56de60a207a Mon Sep 17 00:00:00 2001 From: Gabriela Moldovan Date: Tue, 25 Jul 2023 11:53:59 +0100 Subject: [PATCH] keymgr: Import internal! (fmt). --- crates/tor-keymgr/src/key_type/ssh.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/tor-keymgr/src/key_type/ssh.rs b/crates/tor-keymgr/src/key_type/ssh.rs index 3e8076c60..8854f28f8 100644 --- a/crates/tor-keymgr/src/key_type/ssh.rs +++ b/crates/tor-keymgr/src/key_type/ssh.rs @@ -8,7 +8,7 @@ use ssh_key::Algorithm; use crate::{ErasedKey, KeyType, KeystoreError, Result}; -use tor_error::{ErrorKind, HasKind, internal}; +use tor_error::{internal, ErrorKind, HasKind}; use tor_llcrypto::pk::{curve25519, ed25519}; use zeroize::Zeroizing; @@ -165,9 +165,7 @@ impl KeyType { // we're using internally). match sk.key_data() { KeypairData::Ed25519(key) => Ok(ed25519::Keypair::from_bytes(&key.to_bytes()) - .map_err(|_| { - internal!("failed to build ed25519 key out of ed25519 OpenSSH key") - }) + .map_err(|_| internal!("failed to build ed25519 key out of ed25519 OpenSSH key")) .map(Box::new)?), KeypairData::Other(key) if SshKeyAlgorithm::from(key.algorithm()) == SshKeyAlgorithm::X25519 =>