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

Handle incorrect private keys and support pkcs8 keys #418

Merged
merged 3 commits into from
Jan 9, 2023
Merged

Handle incorrect private keys and support pkcs8 keys #418

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ff48d5
Handle incorrect private keys and support pkcs8 keys
hakanlundvall Jan 9, 2023
12dec0f
Use is_empty instead of comparing len to zero
hakanlundvall Jan 9, 2023
1e94d66
Ran cargo fmt
hakanlundvall Jan 9, 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
12 changes: 11 additions & 1 deletion 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 @@ -41,7 +41,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, RwLock};
use std::time::Duration;
use zenoh_core::Result as ZResult;
use zenoh_core::{zasynclock, zerror, zread, zwrite};
use zenoh_core::{bail, zasynclock, zerror, zread, zwrite};
use zenoh_link_commons::{
LinkManagerUnicastTrait, LinkUnicast, LinkUnicastTrait, NewLinkChannelSender,
};
Expand Down Expand Up @@ -518,6 +518,16 @@ impl TlsServerConfig {
.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_server_private_key))
.map_err(|e| zerror!(e))
.map(|mut keys| keys.drain(..).map(PrivateKey).collect())?;
}

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

let certs: Vec<Certificate> =
rustls_pemfile::certs(&mut Cursor::new(&tls_server_certificate))
.map_err(|e| zerror!(e))
Expand Down