diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04ddac3..9f343a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,20 +56,21 @@ jobs: - name: Run cargo test --features fips run: cargo test --tests --features fips -- --test-threads=1 - test-fips-openssl-3: - name: Test using FIPS openssl 3 - runs-on: ubuntu-latest - container: - image: registry.access.redhat.com/ubi9/ubi:latest - steps: - - name: Install dependencies - run: dnf install -y gcc openssl-devel - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@v1 - with: - toolchain: stable - - uses: Swatinem/rust-cache@v2 - - run: cargo test --tests --features fips -- --test-threads=1 + # https://github.com/tofay/rustls-openssl/issues/31 + # test-fips-openssl-3: + # name: Test using FIPS openssl 3 + # runs-on: ubuntu-latest + # container: + # image: registry.access.redhat.com/ubi9/ubi:latest + # steps: + # - name: Install dependencies + # run: dnf install -y gcc openssl-devel + # - uses: actions/checkout@v4 + # - uses: dtolnay/rust-toolchain@v1 + # with: + # toolchain: stable + # - uses: Swatinem/rust-cache@v2 + # - run: cargo test --tests --features fips -- --test-threads=1 coverage: name: Coverage diff --git a/Cargo.toml b/Cargo.toml index b716582..bbfb288 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustls-openssl" authors = ["Tom Fay "] -version = "0.3.0" +version = "0.3.1" edition = "2024" license = "MIT" description = "Rustls crypto provider for OpenSSL" diff --git a/src/aead.rs b/src/aead.rs index 7bb0d15..06b002c 100644 --- a/src/aead.rs +++ b/src/aead.rs @@ -120,7 +120,7 @@ mod test { match &test.result { TestResult::Invalid => { - if test.flags.iter().any(|flag| *flag == TestFlag::ModifiedTag) { + if test.flags.contains(&TestFlag::ModifiedTag) { assert_ne!( actual_tag[..], test.tag[..], diff --git a/src/hkdf.rs b/src/hkdf.rs index 9a57ef9..1700317 100644 --- a/src/hkdf.rs +++ b/src/hkdf.rs @@ -108,7 +108,6 @@ impl RustlsHkdfExpander for HkdfExpander { } fn add_hkdf_info(ctx: &mut PkeyCtxRef, info: &[&[u8]]) -> Result<(), ErrorStack> { - #[cfg(bugged_add_hkdf_info)] let bugged_version = true; diff --git a/src/kx_group/ec.rs b/src/kx_group/ec.rs index c595d29..db36c15 100644 --- a/src/kx_group/ec.rs +++ b/src/kx_group/ec.rs @@ -33,7 +33,7 @@ pub const SECP384R1: &dyn SupportedKxGroup = &EcKxGroup { }; impl SupportedKxGroup for EcKxGroup { - fn start(&self) -> Result, Error> { + fn start(&self) -> Result, Error> { EcGroup::from_curve_name(self.nid) .and_then(|group| { let priv_key = EcKey::generate(&group)?; diff --git a/src/kx_group/kem.rs b/src/kx_group/kem.rs index 82d20b5..a7e6094 100644 --- a/src/kx_group/kem.rs +++ b/src/kx_group/kem.rs @@ -56,7 +56,7 @@ impl KxGroup { } impl SupportedKxGroup for KxGroup { - fn start(&self) -> Result, Error> { + fn start(&self) -> Result, Error> { self.start_internal() .map(|kx| Box::new(kx) as Box) } @@ -125,7 +125,7 @@ struct X25519HybridKeyExchange { } impl SupportedKxGroup for X25519HybridKxGroup { - fn start(&self) -> Result, Error> { + fn start(&self) -> Result, Error> { self.0.start_internal().map(|inner| { let pub_key = inner.pub_key(); let classical_pub_key = pub_key[pub_key.len() - 32..].to_vec(); diff --git a/src/lib.rs b/src/lib.rs index 330bf67..9d1d868 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -46,7 +46,7 @@ //! ```toml //! [dependencies] //! rustls = { version = "0.23.0", features = ["tls12", "std"], default-features = false } -//! rustls_openssl = "0.3.0" +//! rustls_openssl = "0.3" //! ``` //! //! ### Configuration