Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[openssl] support fips build feature #30916

Merged
merged 12 commits into from
Apr 21, 2023
Merged

[openssl] support fips build feature #30916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d02e1bc
Added option to enable fips build for openssl
lbermes Apr 17, 2023
a7533a9
Adjusted port version
lbermes Apr 17, 2023
fdb8ff7
Updated to support only for Windows
lbermes Apr 17, 2023
b8093ee
Merge remote-tracking branch 'upstream/master' into openssl-enable-fi…
lbermes Apr 17, 2023
9eaef09
Corrected Formatting
lbermes Apr 17, 2023
7ee8e12
Corrected SHA for vcpkg x-add-version --all
lbermes Apr 17, 2023
0441781
Changes requested by review
lbermes Apr 19, 2023
741e853
Corrected SHA for vcpkg x-add-version --all
lbermes Apr 19, 2023
1b911b1
Removed Windows only support
lbermes Apr 19, 2023
cc72e43
Corrected SHA for vcpkg x-add-version --all
lbermes Apr 19, 2023
84a3a54
Added "supports": "!static"
lbermes Apr 20, 2023
73ce04b
Corrected SHA for vcpkg x-add-version --all
lbermes Apr 20, 2023
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
6 changes: 6 additions & 0 deletions ports/openssl/portfile.cmake
View file
Open in desktop
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)
Adela0814 marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5874,7 +5874,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
View file
Open in desktop
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