Skip to content

tls: add PQC compliance policy #1561

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
Jun 23, 2025
Merged

tls: add PQC compliance policy #1561

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
d36357d
tls: add PQC compliance policy
jewertow May 7, 2025
e41a01f
Add global lazy variable PQC_ENABLED
jewertow Jun 20, 2025
5a7da94
Add unused_imports and dead_code to PQC_ENABLED declaration
jewertow Jun 20, 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
7 changes: 7 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use once_cell::sync::Lazy;
use std::env;

pub mod admin;
pub mod app;
pub mod assertions;
Expand Down Expand Up @@ -42,3 +45,7 @@ pub mod xds;

#[cfg(any(test, feature = "testing"))]
pub mod test_helpers;

#[allow(dead_code)]
static PQC_ENABLED: Lazy<bool> =
Lazy::new(|| env::var("COMPLIANCE_POLICY").unwrap_or_default() == "pqc");
12 changes: 10 additions & 2 deletions src/tls/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

use super::Error;

#[allow(unused_imports)]
use crate::PQC_ENABLED;
use crate::identity::{self, Identity};

use std::fmt::Debug;
Expand Down Expand Up @@ -68,14 +70,20 @@ pub(super) fn provider() -> Arc<CryptoProvider> {

#[cfg(feature = "tls-aws-lc")]
pub(super) fn provider() -> Arc<CryptoProvider> {
Arc::new(CryptoProvider {
let mut provider = CryptoProvider {
// Limit to only the subset of ciphers that are FIPS compatible
cipher_suites: vec![
rustls::crypto::aws_lc_rs::cipher_suite::TLS13_AES_256_GCM_SHA384,
rustls::crypto::aws_lc_rs::cipher_suite::TLS13_AES_128_GCM_SHA256,
],
..rustls::crypto::aws_lc_rs::default_provider()
})
};

if *PQC_ENABLED {
provider.kx_groups = vec![rustls::crypto::aws_lc_rs::kx_group::X25519MLKEM768]
}

Arc::new(provider)
}

#[cfg(feature = "tls-openssl")]
Expand Down