Skip to content

Commit

Permalink
[openssl] support fips build feature (#30916)
Browse files Browse the repository at this point in the history
* Added option to enable fips build for openssl

I only implement and tested it for windows as I have no option to do this under linux

* Adjusted port version

* Updated to support only for Windows

* Corrected Formatting

* Corrected SHA for vcpkg x-add-version --all

* Changes requested by review

Removed the not needed FEATURE FIPS
Initialize INSTALL_FIPS as empty

* Corrected SHA for vcpkg x-add-version --all

* Removed Windows only support

* Corrected SHA for vcpkg x-add-version --all

* Added "supports": "!static"

As the provider conecpts needs dynamic linkage

* Corrected SHA for vcpkg x-add-version --all
  • Loading branch information
lbermes authored Apr 21, 2023
1 parent a403a65 commit 6ffa0fc
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 3 deletions.
6 changes: 6 additions & 0 deletions ports/openssl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ vcpkg_list(SET CONFIGURE_OPTIONS
no-tests
)

set(INSTALL_FIPS "")
if("fips" IN_LIST FEATURES)
vcpkg_list(APPEND INSTALL_FIPS install_fips)
vcpkg_list(APPEND CONFIGURE_OPTIONS enable-fips)
endif()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_list(APPEND CONFIGURE_OPTIONS shared)
else()
Expand Down
6 changes: 5 additions & 1 deletion ports/openssl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openssl",
"version": "3.1.0",
"port-version": 1,
"port-version": 2,
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
"homepage": "https://www.openssl.org",
"license": "Apache-2.0",
Expand All @@ -20,6 +20,10 @@
}
],
"features": {
"fips": {
"description": "Enable fips",
"supports": "!static"
},
"tools": {
"description": "Install openssl executable and scripts",
"supports": "!uwp"
Expand Down
3 changes: 2 additions & 1 deletion ports/openssl/windows/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ vcpkg_build_nmake(
"LD=${ld}"
"LDFLAGS=${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}"
PROJECT_NAME "makefile"
TARGET install_dev install_modules
TARGET install_dev install_modules ${INSTALL_FIPS}
LOGFILE_ROOT install
OPTIONS
"INSTALL_PDBS=${OPENSSL_BUILD_MAKES_PDBS}" # install-pdbs.patch
Expand Down Expand Up @@ -125,4 +125,5 @@ file(REMOVE
"${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf.dist"
"${CURRENT_PACKAGES_DIR}/debug/openssl.cnf"
"${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist"
"${CURRENT_PACKAGES_DIR}/debug/fipsmodule.cnf"
)
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5882,7 +5882,7 @@
},
"openssl": {
"baseline": "3.1.0",
"port-version": 1
"port-version": 2
},
"openssl-unix": {
"baseline": "deprecated",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openssl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "64fc47730d346ecacc9f948c2c3138363ed8f702",
"version": "3.1.0",
"port-version": 2
},
{
"git-tree": "b123beef6759b490ff8679b5cd4db0f721a2808a",
"version": "3.1.0",
Expand Down

0 comments on commit 6ffa0fc

Please sign in to comment.