Skip to content
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
29 changes: 15 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "rustls-openssl"
authors = ["Tom Fay <tom@teamfay.co.uk>"]
version = "0.3.0"
version = "0.3.1"
edition = "2024"
license = "MIT"
description = "Rustls crypto provider for OpenSSL"
Expand Down
2 changes: 1 addition & 1 deletion src/aead.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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[..],
Expand Down
1 change: 0 additions & 1 deletion src/hkdf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ impl RustlsHkdfExpander for HkdfExpander {
}

fn add_hkdf_info<T>(ctx: &mut PkeyCtxRef<T>, info: &[&[u8]]) -> Result<(), ErrorStack> {

#[cfg(bugged_add_hkdf_info)]
let bugged_version = true;

Expand Down
2 changes: 1 addition & 1 deletion src/kx_group/ec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub const SECP384R1: &dyn SupportedKxGroup = &EcKxGroup {
};

impl SupportedKxGroup for EcKxGroup {
fn start(&self) -> Result<Box<(dyn ActiveKeyExchange)>, Error> {
fn start(&self) -> Result<Box<dyn ActiveKeyExchange>, Error> {
EcGroup::from_curve_name(self.nid)
.and_then(|group| {
let priv_key = EcKey::generate(&group)?;
Expand Down
4 changes: 2 additions & 2 deletions src/kx_group/kem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl KxGroup {
}

impl SupportedKxGroup for KxGroup {
fn start(&self) -> Result<Box<(dyn ActiveKeyExchange)>, Error> {
fn start(&self) -> Result<Box<dyn ActiveKeyExchange>, Error> {
self.start_internal()
.map(|kx| Box::new(kx) as Box<dyn ActiveKeyExchange>)
}
Expand Down Expand Up @@ -125,7 +125,7 @@ struct X25519HybridKeyExchange {
}

impl SupportedKxGroup for X25519HybridKxGroup {
fn start(&self) -> Result<Box<(dyn ActiveKeyExchange)>, Error> {
fn start(&self) -> Result<Box<dyn ActiveKeyExchange>, 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();
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading