8000 post-quantum key exchange writeup by ctz · Pull Request #2281 · rustls/rustls · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

post-quantum key exchange writeup #2281

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.

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
merged 3 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 13 additions & 6 deletions admin/clippy
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,19 @@ run_clippy --package rustls --no-default-features --all-targets

# run all workspace members (individually, because we don't want feature unification)
for p in $(admin/all-workspace-members) ; do
# `bogo` is allergic to `--all-features`
if [ "$p" == "bogo" ] ; then
ALL_FEATURES="--features fips"
else
ALL_FEATURES="--all-features"
fi
case "$p" in
bogo)
# `bogo` is allergic to `--all-features`
ALL_FEATURES="--features fips"
;;
rustls-bench)
# rustls-bench with post-quantum cannot co-exist with aws-lc-rs+fips
ALL_FEATURES=$(admin/all-features-except post-quantum rustls-bench)
;;
*)
ALL_FEATURES="--all-features"
;;
esac

run_clippy --package $p $ALL_FEATURES --all-targets
done
Expand Down
2 changes: 2 additions & 0 deletions rustls-bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ edition = "2021"
[dependencies]
clap = { workspace = true }
rustls = { path = "../rustls" }
rustls-post-quantum = { path = "../rustls-post-quantum", optional = true }

[features]
default = []
aws-lc-rs = ["rustls/aws-lc-rs"]
fips = ["rustls/fips", "aws-lc-rs"]
post-quantum = ["dep:rustls-post-quantum"]
ring = ["rustls/ring"]

[target.'cfg(not(target_env = "msvc"))'.dependencies]
Expand Down
9 changes: 9 additions & 0 deletions rustls-bench/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,8 @@ enum Provider {
AwsLcRs,
#[cfg(all(feature = "aws-lc-rs", feature = "fips"))]
AwsLcRsFips,
#[cfg(feature = "post-quantum")]
PostQuantum,
#[cfg(feature = "ring")]
Ring,
#[value(skip)]
Expand All @@ -943,6 +945,8 @@ impl Provider {
Self::AwsLcRs => rustls::crypto::aws_lc_rs::default_provider(),
#[cfg(all(feature = "aws-lc-rs", feature = "fips"))]
Self::AwsLcRsFips => rustls::crypto::default_fips_provider(),
#[cfg(feature = "post-quantum")]
Self::PostQuantum => rustls_post_quantum::provider(),
#[cfg(feature = "ring")]
Self::Ring => rustls::crypto::ring::default_provider(),
Self::_None => unreachable!(),
Expand All @@ -955,6 +959,8 @@ impl Provider {
Self::AwsLcRs => rustls::crypto::aws_lc_rs::Ticketer::new(),
#[cfg(all(feature = "aws-lc-rs", feature = "fips"))]
Self::AwsLcRsFips => rustls::crypto::aws_lc_rs::Ticketer::new(),
#[cfg(feature = "post-quantum")]
Self::PostQuantum => rustls::crypto::aws_lc_rs::Ticketer::new(),
#[cfg(feature = "ring")]
Self::Ring => rustls::crypto::ring::Ticketer::new(),
Self::_None => unreachable!(),
Expand Down Expand Up @@ -991,6 +997,9 @@ impl Provider {
#[cfg(all(feature = "aws-lc-rs", feature = "fips"))]
available.push(Self::AwsLcRsFips);

#[cfg(feature = "post-quantum")]
available.push(Self::PostQuantum);

#[cfg(feature = "ring")]
available.push(Self::Ring);

Expand Down
Loading
Loading
0