Skip to content

Commit fa57ed6

Browse files
John ZakrzewskiJohn Zakrzewski
authored andcommitted
fix: address failed tests, rely on cert-manager for certs
Signed-off-by: John Zakrzewski <[email protected]>
1 parent 3e15568 commit fa57ed6

File tree

1 file changed

+3
-3
lines changed
  • control-plane/rest/service/src

1 file changed

+3
-3
lines changed

control-plane/rest/service/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use clap::Parser;
2121
use grpc::{client::CoreClient, operations::jsongrpc::client::JsonGrpcClient};
2222
use http::Uri;
2323
use rustls::{pki_types::PrivateKeyDer, ServerConfig};
24-
use rustls_pemfile::{certs, pkcs8_private_keys};
24+
use rustls_pemfile::{certs, rsa_private_keys};
2525
use std::{fs::File, io::BufReader, time::Duration};
2626
use stor_port::transport_api::{RequestMinTimeout, TimeoutOptions};
2727
use utils::{
@@ -180,7 +180,7 @@ fn load_certificates<R: std::io::Read>(
180180
.map_err(|_| {
181181
anyhow::anyhow!("Failed to retrieve certificates from the certificate file",)
182182
})?;
183-
let mut keys: Vec<rustls::pki_types::PrivatePkcs8KeyDer<'_>> = pkcs8_private_keys(key_file)
183+
let mut keys = rsa_private_keys(key_file)
184184
.collect::<Result<Vec<_>, _>>()
185185
.map_err(|_| {
186186
anyhow::anyhow!("Failed to retrieve the rsa private keys from the key file",)
@@ -191,7 +191,7 @@ fn load_certificates<R: std::io::Read>(
191191
}
192192
let config = config
193193
.with_no_client_auth()
194-
.with_single_cert(cert_chain, PrivateKeyDer::Pkcs8(keys.remove(0)))?;
194+
.with_single_cert(cert_chain, PrivateKeyDer::Pkcs1(keys.remove(0)))?;
195195
Ok(config)
196196
}
197197

0 commit comments

Comments
 (0)