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

Stabilize ML-KEM & KDFs; bump to v1.12.0 #628

Merged
merged 5 commits into from
Dec 16, 2024
Merged

Stabilize ML-KEM & KDFs; bump to v1.12.0 #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49a97e4
Stabilize ML-KEM; bump to v1.12.0
justsmth Dec 11, 2024
9d67d48
Stabilize KDF APIs
justsmth Dec 12, 2024
de40195
Drop support for Kyber Round 3
justsmth Dec 12, 2024
0b172b8
Only need to test prebuilt nasm w/ aws-lc-sys
justsmth Dec 13, 2024
452c3c8
Merge branch 'main' into stabilize-ml-kem
justsmth Dec 16, 2024
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
4 changes: 1 addition & 3 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ jobs:
strategy:
fail-fast: false
matrix:
crate: [ aws-lc-sys, aws-lc-rs ]
args:
- publish --dry-run
steps:
Expand All @@ -170,8 +169,7 @@ jobs:
else
exit 0;
fi
- name: ${{ matrix.crate }}
working-directory: ./${{ matrix.crate }}
- working-directory: ./aws-lc-sys
shell: bash
run: AWS_LC_SYS_PREBUILT_NASM=1 cargo publish --dry-run

Expand Down
18 changes: 5 additions & 13 deletions aws-lc-rs-testing/benches/kem_benchmark.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,14 @@

use aws_lc_rs::{
kem::DecapsulationKey,
unstable::kem::{get_algorithm, AlgorithmId},
kem::{Algorithm, ML_KEM_1024, ML_KEM_512, ML_KEM_768},
};
use criterion::{criterion_group, criterion_main, Criterion};

#[allow(deprecated)]
const UNSTABLE_ALGORITHMS: &[Option<&aws_lc_rs::kem::Algorithm<AlgorithmId>>] = &[
get_algorithm(AlgorithmId::Kyber512_R3),
get_algorithm(AlgorithmId::Kyber768_R3),
get_algorithm(AlgorithmId::Kyber1024_R3),
];
const KEM_ALGORITHMS: &[Algorithm; 3] = &[ML_KEM_512, ML_KEM_768, ML_KEM_1024];

fn bench_kem_keygen(c: &mut Criterion) {
for ele in UNSTABLE_ALGORITHMS {
let ele = ele.unwrap();
for ele in KEM_ALGORITHMS {
let bench_group_name = format!("KEM/{:?}/keygen", ele.id());
let mut group = c.benchmark_group(bench_group_name);
group.bench_function("AWS-LC", |b| {
Expand All @@ -28,8 +22,7 @@ fn bench_kem_keygen(c: &mut Criterion) {
}

fn bench_kem_encapsulate(c: &mut Criterion) {
for ele in UNSTABLE_ALGORITHMS {
let ele = ele.unwrap();
for ele in KEM_ALGORITHMS {
let bench_group_name = format!("KEM/{:?}/encapsulate", ele.id());
let mut group = c.benchmark_group(bench_group_name);
group.bench_function("AWS-LC", |b| {
Expand All @@ -46,8 +39,7 @@ fn bench_kem_encapsulate(c: &mut Criterion) {
}

fn bench_kem_decapsulate(c: &mut Criterion) {
for ele in UNSTABLE_ALGORITHMS {
let ele = ele.unwrap();
for ele in KEM_ALGORITHMS {
let bench_group_name = format!("KEM/{:?}/decapsulate", ele.id());
let mut group = c.benchmark_group(bench_group_name);
group.bench_function("AWS-LC", |b| {
Expand Down
4 changes: 2 additions & 2 deletions aws-lc-rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "aws-lc-rs"
authors = ["AWS-LibCrypto"]
version = "1.11.1"
version = "1.12.0"
# this crate re-exports whatever sys crate that was selected
links = "aws_lc_rs_1_11_1_sys"
links = "aws_lc_rs_1_12_0_sys"
edition = "2021"
rust-version = "1.63.0"
keywords = ["crypto", "cryptography", "security"]
Expand Down
12 changes: 5 additions & 7 deletions aws-lc-rs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ test:
cargo test --all-targets --features unstable
cargo test --release --all-targets
cargo test --release --all-targets --features bindgen,unstable
ifeq ($(UNAME_S),Linux)
cargo test --release --all-targets --features fips,unstable
cargo test --no-default-features --features fips,unstable
endif
cargo test --no-default-features --features aws-lc-sys,unstable
cargo test --no-default-features --features aws-lc-sys,ring-sig-verify,unstable
cargo test --no-default-features --features aws-lc-sys,ring-io,unstable
cargo test --no-default-features --features aws-lc-sys,alloc,unstable
cargo test --no-default-features --all-targets --features fips,unstable
cargo test --no-default-features --all-targets --features aws-lc-sys,unstable
cargo test --no-default-features --all-targets --features aws-lc-sys,ring-sig-verify,unstable
cargo test --no-default-features --all-targets --features aws-lc-sys,ring-io,unstable
cargo test --no-default-features --all-targets --features aws-lc-sys,alloc,unstable

msrv:
cargo msrv verify
Expand Down
Loading
Loading