[FIPS 4.0] Add COHABITANT_BINARIES option to install tool binaries with 'aws-lc-…#3317
Open
justsmth wants to merge 1 commit into
Open
Conversation
…' prefix Backport of the binary-renaming logic from upstream commit 9651480 ("Fix: Apply COHABITANT_HEADERS logic to location of tool binaries aws#3116") adapted as a standalone option for the FIPS 4.0 branch. When -DCOHABITANT_BINARIES=ON is passed to CMake, the installed binaries are renamed: bssl -> aws-lc-bssl, openssl -> aws-lc-openssl, c_rehash -> aws-lc-c_rehash. This prevents file conflicts when AWS-LC-FIPS coexists with OpenSSL in the same installation prefix.
justsmth
changed the title
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## fips-2025-09-12-lts #3317 +/- ##
====================================================
Coverage 78.76% 78.77%
====================================================
Files 667 667
Lines 113431 113431
Branches 16078 16077 -1
====================================================
+ Hits 89343 89351 +8
+ Misses 23292 23285 -7
+ Partials 796 795 -1 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
crlorentzen
approved these changes
Jun 26, 2026
| endif() | ||
| endif() | ||
|
|
||
| if(COHABITANT_BINARIES) |
Contributor
There was a problem hiding this comment.
Nit: Couldn't be do without this conditional check for setting the OUTPUT_NAME? reading the CMakeLists.txt we always define AWSLC_BIN_PREFIX as either "" (empty string), or "aws-lc-" based on COHABITANT off/on. Not recommending a change as I understand this just brings the existing design from mainline.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issues:
Addresses P460497046
Description of changes:
Backports #3116 (
COHABITANT_BINARIESsupport) to the FIPS 4.0 branch. When-DCOHABITANT_BINARIES=ONis passed to CMake, the installed tool binaries are renamed with anaws-lc-prefix (aws-lc-bssl,aws-lc-openssl,aws-lc-c_rehash) to avoid filename conflicts when AWS-LC-FIPS coexists with OpenSSL in the same install prefix.Call-outs:
This is NOT strictly a cherry-pick of upstream commit 9651480. That commit depends on the
ENABLE_DIST_PKG/COHABITANT_HEADERSinfrastructure introduced in PR #3042, which is a larger refactor (10 files, 600+ insertions).The option defaults to OFF so there is no behavioral change for existing consumers.
Testing:
Verified CMake configures cleanly with both
-DCOHABITANT_BINARIES=ONand-DCOHABITANT_BINARIES=OFF. Confirmed via generated build rules that binaries are correctly prefixed (ON) or unchanged (OFF).By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.