Skip to content

chore: upgrade OpenSSL to 3.6.0 but keep 3.1.2 for FIPS crypto provider - #667

Merged
Manuthor merged 16 commits into
developfrom
feat/upgrade_openssl
Jan 20, 2026
Merged

chore: upgrade OpenSSL to 3.6.0 but keep 3.1.2 for FIPS crypto provider#667
Manuthor merged 16 commits into
developfrom
feat/upgrade_openssl

Conversation

@Manuthor

@Manuthor Manuthor commented Jan 5, 2026

Copy link
Copy Markdown
Contributor

The goal of this PR is to upgrade OpenSSL to 3.6.0 but keep official FIPS 3.1.2 version on FIPS mode.

Summary:

OpenSSL Linkage FIPS Non‑FIPS
Static Linkage: OpenSSL 3.6.0; runtime loads FIPS provider from OpenSSL 3.1.2 Linkage: OpenSSL 3.6.0; runtime uses default/legacy providers
Dynamic Linkage: OpenSSL 3.1.2; ships FIPS configs and provider OpenSSL 3.1.2 Linkage: OpenSSL 3.6.0; ships libssl/libcrypto and providers
  • OpenSSL upgrade + packaging plumbing
    • Upgrades OpenSSL to 3.6.0 while keeping 3.1.2 for the FIPS provider.
    • Touches: build.rs, Cargo.toml, openssl.nix, kms-server.nix, shell.nix, default.nix, docker.nix, vcpkg.json, vcpkg_fips.json.
  • CI / scripts restructure
    • Changes in .github/scripts/*:
      • refactor smoke tests - removing duplicated tests (add smoke_test_linux.sh, updates to smoke_test_{deb,rpm,dmg}.sh)
      • update_hashes.sh: Nix hashes are retrieved from last CI failure
    • Workflow tweaks: .github/workflows/{packaging.yml,pr.yml,main_base.yml}.
  • HSM test stabilization
    • Updates HSM scripts: .github/scripts/test_hsm_{proteccio,utimaco,softhsm2}.sh (and related).
    • Fixes Google CSE HSM verification test: using_hsm.rs.
  • Docs / metadata + SBOM
    • README reorg: README.md
    • Regenerated SBOM artifacts with new OpenSSL version: sbom/openssl/, sbom/server/

@Manuthor
Manuthor force-pushed the feat/upgrade_openssl branch 4 times, most recently from 8b61be0 to dd3d575 Compare January 10, 2026 06:39
@Manuthor
Manuthor force-pushed the feat/upgrade_openssl branch from 255518e to 81ca19b Compare January 14, 2026 09:53
@Manuthor
Manuthor changed the base branch from develop to chore/remove_sqlx January 14, 2026 09:53
Base automatically changed from chore/remove_sqlx to develop January 19, 2026 10:13
@Manuthor
Manuthor force-pushed the feat/upgrade_openssl branch 2 times, most recently from b078517 to 205477e Compare January 19, 2026 10:21
@Manuthor
Manuthor force-pushed the feat/upgrade_openssl branch from 205477e to 95c9035 Compare January 19, 2026 11:13
@Manuthor
Manuthor force-pushed the feat/upgrade_openssl branch from 95c9035 to 107ba1d Compare January 19, 2026 11:22

@serene-kitfisto-8899 serene-kitfisto-8899 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@Manuthor
Manuthor merged commit 78deeb1 into develop Jan 20, 2026
194 of 195 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants