Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try pkcs8_private_keys if rsa_private_keys doesn't return any keys Resolves #448 #450

Merged
merged 2 commits into from
Mar 27, 2023
Merged

try pkcs8_private_keys if rsa_private_keys doesn't return any keys Resolves #448 #450

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a0e3c2
try pkcs8_private_keys if rsa_private_keys doesn't return any keys Re…
Tejpbit Mar 23, 2023
ff6ff3f
apply formatting
Tejpbit Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions io/zenoh-links/zenoh-link-tls/src/unicast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,17 @@ impl TlsClientConfig {
.map_err(|e| zerror!(e))
.map(|mut keys| keys.drain(..).map(PrivateKey).collect())?;

if keys.is_empty() {
keys =
rustls_pemfile::pkcs8_private_keys(&mut Cursor::new(&tls_client_private_key))
.map_err(|e| zerror!(e))
.map(|mut keys| keys.drain(..).map(PrivateKey).collect())?;
}

if keys.is_empty() {
bail!("No private key found");
}

ClientConfig::builder()
.with_safe_default_cipher_suites()
.with_safe_default_kx_groups()
Expand Down