Skip to content

Commit

Permalink
Merge pull request #828 from ginglis13/fips
Browse files Browse the repository at this point in the history
Add FIPS support
  • Loading branch information
ginglis13 authored Oct 1, 2024
2 parents aecc1a1 + 680cc11 commit 5619bb1
Show file tree
Hide file tree
Showing 9 changed files with 208 additions and 39 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/rust.yml
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

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

6 changes: 6 additions & 0 deletions Makefile
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

0 comments on commit 5619bb1

Please sign in to comment.