Skip to content

Optionally support aws-lc-rs #158

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 12 commits into from
Sep 20, 2023
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
31 changes: 30 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable

- run: cargo package
- run: cargo package --all-features

test:
name: Build+test
Expand All @@ -111,6 +111,7 @@ jobs:
- --features=alloc
- --all-features
- --no-default-features
- --no-default-features --features alloc,std,aws_lc_rs

mode:
- # debug
Expand All @@ -125,6 +126,8 @@ jobs:
- features: # Default
- features: --features=alloc
- features: --no-default-features
- features: --no-default-features --features alloc,std
- features: --no-default-features --features alloc,std,aws_lc_rs
- features: --all-features
mode: --release
- features: --all-features
Expand All @@ -150,6 +153,11 @@ jobs:
rust_channel: stable
host_os: ubuntu-20.04

- features: --no-default-features --features alloc,std
mode: # debug
rust_channel: stable
host_os: ubuntu-20.04

- features: --all-features
mode: --release
rust_channel: stable
Expand Down Expand Up @@ -179,6 +187,23 @@ jobs:
mode: # debug
rust_channel: stable
host_os: ubuntu-latest

# check aws-lc-rs alone
- features: --no-default-features --features alloc,std,aws_lc_rs
mode: # debug
rust_channel: stable
host_os: macos-latest

- features: --no-default-features --features alloc,std,aws_lc_rs
mode: # debug
rust_channel: stable
host_os: windows-latest

- features: --no-default-features --features alloc,std,aws_lc_rs
mode: # debug
rust_channel: stable
host_os: ubuntu-latest

steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand All @@ -190,6 +215,10 @@ jobs:
with:
toolchain: ${{ matrix.rust_channel }}

- name: Install NASM for aws-lc-rs on Windows
if: runner.os == 'Windows'
uses: ilammy/setup-nasm@v1

- name: cargo test (${{ matrix.mode }}, ${{ matrix.features }})
run: cargo test -vv ${{ matrix.features }} ${{ matrix.mode }} -- --ignored
env:
Expand Down
6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ include = [
"/LICENSE",
"README.md",

"src/aws_lc_rs_algs.rs",
"src/calendar.rs",
"src/cert.rs",
"src/crl/mod.rs",
Expand All @@ -45,6 +46,7 @@ include = [
"src/name/name.rs",
"src/signed_data.rs",
"src/ring_algs.rs",
"src/alg_tests.rs",
"src/time.rs",
"src/trust_anchor.rs",
"src/x509.rs",
Expand All @@ -65,11 +67,13 @@ name = "webpki"

[features]
default = ["std", "ring"]
ring = ["dep:ring"]
alloc = ["ring?/alloc", "pki-types/alloc"]
aws_lc_rs = ["dep:aws-lc-rs"]
ring = ["dep:ring"]
std = ["alloc"]

[dependencies]
aws-lc-rs = { version = "1.0.0", optional = true }
pki-types = { package = "rustls-pki-types", version = "0.2.1", default-features = false }
ring = { version = "0.16.19", default-features = false, optional = true }
untrusted = "0.7.1"
Expand Down
Loading