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

Jump to bottom

Add FIPS support #828

Merged
merged 3 commits into from
Oct 1, 2024
Merged

Add FIPS support #828

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
af6a909
feature: add a 'fips' feature to crates
ginglis13 Sep 26, 2024
f501c0f
tuftool: install default CryptoProvider for HTTP client
ginglis13 Sep 26, 2024
680cc11
deps: bump reqwest to 0.12, httptest to 0.16
ginglis13 Sep 30, 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
7 changes: 6 additions & 1 deletion .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ jobs:
strategy:
fail-fast: false
matrix:
make_target: ["check-licenses", "build", "integ"]
make_target: ["check-licenses", "build", "integ", "integ-fips"]
os: [ubuntu-latest, windows-latest, macos-latest]
exclude:
- os: windows-latest
make_target: check-licenses
- os: macos-latest
make_target: check-licenses
- os: macos-latest
make_target: integ-fips
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -33,6 +35,9 @@ jobs:
key: ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}
- uses: ilammy/setup-nasm@v1 # requirement for windows FIPS builds
- name: Install ninja-build tool
uses: seanmiddleditch/gha-setup-ninja@v4
# print the current rustc. replace stable to pin to a specific toolchain version.
- run: rustup default stable
- run: rustup component add rustfmt
Expand Down
200 changes: 171 additions & 29 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,10 @@ noxious:
integ: noxious
set +e
cargo test --manifest-path tough/Cargo.toml --features '' --locked
cargo test --manifest-path tough/Cargo.toml --features 'http' --features 'integ' --locked

# tests tough fips features with and without the http feature.
integ-fips: noxious
set +e
cargo test --manifest-path tough/Cargo.toml --features 'fips' --locked
cargo test --manifest-path tough/Cargo.toml --all-features --locked
Loading
Loading