diff --git a/io/zenoh-links/zenoh-link-quic/src/lib.rs b/io/zenoh-links/zenoh-link-quic/src/lib.rs index d4c22788b..abaefd199 100644 --- a/io/zenoh-links/zenoh-link-quic/src/lib.rs +++ b/io/zenoh-links/zenoh-link-quic/src/lib.rs @@ -111,5 +111,5 @@ pub mod config { pub const TLS_ENABLE_MTLS: &str = "enable_mtls"; pub const TLS_VERIFY_NAME_ON_CONNECT: &str = "verify_name_on_connect"; - pub const TLS_VERIFY_NAME_ON_CONNECT_DEFAULT: &str = "true"; + pub const TLS_VERIFY_NAME_ON_CONNECT_DEFAULT: bool = true; } diff --git a/io/zenoh-links/zenoh-link-quic/src/utils.rs b/io/zenoh-links/zenoh-link-quic/src/utils.rs index b7f0e42af..d6bd9f989 100644 --- a/io/zenoh-links/zenoh-link-quic/src/utils.rs +++ b/io/zenoh-links/zenoh-link-quic/src/utils.rs @@ -133,12 +133,13 @@ impl ConfigurationInspector for TlsConfigurator { _ => {} } - if let Some(server_name_verification) = c.verify_name_on_connect() { - match server_name_verification { - true => ps.push((TLS_VERIFY_NAME_ON_CONNECT, "true")), - false => ps.push((TLS_VERIFY_NAME_ON_CONNECT, "false")), - }; - } + match c + .verify_name_on_connect() + .unwrap_or(TLS_VERIFY_NAME_ON_CONNECT_DEFAULT) + { + true => ps.push((TLS_VERIFY_NAME_ON_CONNECT, "true")), + false => ps.push((TLS_VERIFY_NAME_ON_CONNECT, "false")), + }; Ok(parameters::from_iter(ps.drain(..))) } diff --git a/io/zenoh-links/zenoh-link-tls/src/lib.rs b/io/zenoh-links/zenoh-link-tls/src/lib.rs index aad7958e0..2a18e3b5b 100644 --- a/io/zenoh-links/zenoh-link-tls/src/lib.rs +++ b/io/zenoh-links/zenoh-link-tls/src/lib.rs @@ -107,4 +107,5 @@ pub mod config { pub const TLS_ENABLE_MTLS: &str = "enable_mtls"; pub const TLS_VERIFY_NAME_ON_CONNECT: &str = "verify_name_on_connect"; + pub const TLS_VERIFY_NAME_ON_CONNECT_DEFAULT: bool = true; } diff --git a/io/zenoh-links/zenoh-link-tls/src/utils.rs b/io/zenoh-links/zenoh-link-tls/src/utils.rs index e8a20049d..7df072f1c 100644 --- a/io/zenoh-links/zenoh-link-tls/src/utils.rs +++ b/io/zenoh-links/zenoh-link-tls/src/utils.rs @@ -135,12 +135,13 @@ impl ConfigurationInspector for TlsConfigurator { _ => {} } - if let Some(server_name_verification) = c.verify_name_on_connect() { - match server_name_verification { - true => ps.push((TLS_VERIFY_NAME_ON_CONNECT, "true")), - false => ps.push((TLS_VERIFY_NAME_ON_CONNECT, "false")), - }; - } + match c + .verify_name_on_connect() + .unwrap_or(TLS_VERIFY_NAME_ON_CONNECT_DEFAULT) + { + true => ps.push((TLS_VERIFY_NAME_ON_CONNECT, "true")), + false => ps.push((TLS_VERIFY_NAME_ON_CONNECT, "false")), + }; Ok(parameters::from_iter(ps.drain(..))) }