Skip to content

show crypto provider in ztunnel version #1545

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

Merged
istio-testing merged 3 commits into from
May 8, 2025
Merged

show crypto provider in ztunnel version #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aec7aee
Version shows crypto provider
Stevenjin8 Apr 29, 2025
853ebcc
All tls providers
Stevenjin8 Apr 29, 2025
21f386f
Move crypto consts
Stevenjin8 May 7, 2025
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
9 changes: 9 additions & 0 deletions src/tls/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ pub trait ServerCertProvider: Send + Sync + Clone {

pub(super) static TLS_VERSIONS: &[&rustls::SupportedProtocolVersion] = &[&rustls::version::TLS13];

#[cfg(feature = "tls-aws-lc")]
pub static CRYPTO_PROVIDER: &str = "tls-aws-lc";
#[cfg(feature = "tls-ring")]
pub static CRYPTO_PROVIDER: &str = "tls-ring";
#[cfg(feature = "tls-boring")]
pub static CRYPTO_PROVIDER: &str = "tls-boring";
#[cfg(feature = "tls-openssl")]
pub static CRYPTO_PROVIDER: &str = "tls-openssl";

// Ztunnel use `rustls` with pluggable crypto modules.
// All crypto MUST be done via the below providers.
//
Expand Down
9 changes: 7 additions & 2 deletions src/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ use std::fmt;
use std::fmt::{Display, Formatter};
use std::string::String;

use crate::tls::CRYPTO_PROVIDER;

const BUILD_VERSION: &str = env!("ZTUNNEL_BUILD_buildVersion");
const BUILD_GIT_REVISION: &str = env!("ZTUNNEL_BUILD_buildGitRevision");
const BUILD_STATUS: &str = env!("ZTUNNEL_BUILD_buildStatus");
Expand All @@ -34,6 +36,7 @@ pub struct BuildInfo {
build_status: String,
git_tag: String,
pub istio_version: String,
crypto_provider: String,
}

impl BuildInfo {
Expand All @@ -47,6 +50,7 @@ impl BuildInfo {
git_tag: BUILD_TAG.to_string(),
istio_version: env::var("ISTIO_META_ISTIO_VERSION")
.unwrap_or_else(|_| "unknown".to_string()),
crypto_provider: CRYPTO_PROVIDER.to_string(),
}
}
}
Expand All @@ -55,14 +59,15 @@ impl Display for BuildInfo {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
write!(
f,
"version.BuildInfo{{Version:\"{}\", GitRevision:\"{}\", RustVersion:\"{}\", BuildProfile:\"{}\", BuildStatus:\"{}\", GitTag:\"{}\", IstioVersion:\"{}\"}}",
"version.BuildInfo{{Version:\"{}\", GitRevision:\"{}\", RustVersion:\"{}\", BuildProfile:\"{}\", BuildStatus:\"{}\", GitTag:\"{}\", IstioVersion:\"{}\", CryptoProvider:\"{}\"}}",
self.version,
self.git_revision,
self.rust_version,
self.build_profile,
self.build_status,
self.git_tag,
self.istio_version
self.istio_version,
self.crypto_provider,
)
}
}