Remove redundant code

tcp_relay_client/src/relay_client.rs

@@ -1,14 +1,14 @@
-use std::io::Cursor;
 use std::sync::Arc;
 
 use futures::{SinkExt, StreamExt};
 use hyper_rustls::ConfigBuilderExt;
-use rustls::{Certificate, PrivateKey, RootCertStore};
-use rustls_pemfile::{read_one, Item};
+use rustls::RootCertStore;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::{TcpListener, TcpStream};
 use tokio_tungstenite::tungstenite::Message;
 
+use base::cert_utils;
+
 use crate::client_config::ClientConfig;
 
 pub async fn relay_client(ws_url: String, listen_address: String, config: Arc<ClientConfig>) {
@@ -46,11 +46,10 @@ async fn relay_connection(ws_url: String, socket: TcpStream, conf: Arc<ClientCon
             Some(cert) => {
                 log::debug!("Using custom root certificates");
                 let mut store = RootCertStore::empty();
-                rustls_pemfile::certs(&mut Cursor::new(cert))
-                    .expect("Failed to parse root certificates!")
-                    .into_iter()
-                    .map(Certificate)
-                    .for_each(|c| store.add(&c).expect("Failed to add certificate to chain!"));
+                cert_utils::parse_pem_certificates(&cert)
+                    .unwrap()
+                    .iter()
+                    .for_each(|c| store.add(c).expect("Failed to add certificate to chain!"));
 
                 config.with_root_certificates(store)
             }
@@ -59,29 +58,14 @@ async fn relay_connection(ws_url: String, socket: TcpStream, conf: Arc<ClientCon
         let config = match conf.get_client_keypair() {
             None => config.with_no_client_auth(),
             Some((certs, key)) => {
-                let certs = rustls_pemfile::certs(&mut Cursor::new(certs))
-                    .expect("Failed to parse client certificates!")
-                    .into_iter()
-                    .map(Certificate)
-                    .collect::<Vec<_>>();
+                let certs = cert_utils::parse_pem_certificates(certs)
+                    .expect("Failed to parse client certificate!");
 
-                let key = match read_one(&mut Cursor::new(key))
-                    .expect("Failed to read client private key!")
-                {
-                    None => {
-                        log::error!("Failed to extract private key!");
-                        panic!();
-                    }
-                    Some(Item::PKCS8Key(key)) => key,
-                    Some(Item::RSAKey(key)) => key,
-                    _ => {
-                        log::error!("Unsupported private key type!");
-                        panic!();
-                    }
-                };
+                let key = cert_utils::parse_pem_private_key(key)
+                    .expect("Failed to parse client auth private key!");
 
                 config
-                    .with_single_cert(certs, PrivateKey(key))
+                    .with_single_cert(certs, key)
                     .expect("Failed to set client certificate!")
             }
         };