From 375a15185149753ce91b22b3175a4b3f4094e60f Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 13 Dec 2021 16:47:14 +0100 Subject: [PATCH] Use PathBuf type to clarify usage of paths --- src/config.rs | 5 +++-- src/connection.rs | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/config.rs b/src/config.rs index 2ed6319..2ba7fb8 100644 --- a/src/config.rs +++ b/src/config.rs @@ -26,14 +26,15 @@ //! ``` use std::collections::HashMap; +use std::path::PathBuf; use serde::{Deserialize, Serialize}; /// Paths to the client certificate and client key PEM files #[derive(Serialize, Deserialize, Debug)] pub struct EppClientTlsFiles { - pub cert_chain: String, - pub key: String, + pub cert_chain: PathBuf, + pub key: PathBuf, } /// Config that stores settings for multiple registries diff --git a/src/connection.rs b/src/connection.rs index baf9ffc..9360623 100644 --- a/src/connection.rs +++ b/src/connection.rs @@ -158,7 +158,7 @@ async fn epp_connect( let mut r = BufReader::new(File::open(key_file).unwrap()); let mut rsa_keys = rustls_pemfile::rsa_private_keys(&mut r).unwrap(); if rsa_keys.len() > 1 { - warn!("Multiple RSA keys found in PEM file {}", key_file); + warn!("Multiple RSA keys found in PEM file {:?}", key_file); } key = rsa_keys.pop(); @@ -166,7 +166,7 @@ async fn epp_connect( r.seek(SeekFrom::Start(0))?; let mut pkcs8_keys = rustls_pemfile::pkcs8_private_keys(&mut r).unwrap(); if pkcs8_keys.len() > 1 { - warn!("Multiple PKCS8 keys found in PEM file {}", key_file); + warn!("Multiple PKCS8 keys found in PEM file {:?}", key_file); } key = pkcs8_keys.pop(); }