Cherry-pick OpenSSL 3.1.2 onto 2.4
#84
Merged
Conversation
This file contains 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
|
This PR is huge. Since the beta, I have not merged from master to not have to much untested code in our release. |
daschuer
requested changes
Aug 21, 2023
|
That sounds like a reasonable fix, I'll look into that. Should I place it in the |
* 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
* Corrected fipsmodule.cnf install move it to the same position as openssl.cnf, both are only examples of openssl * Adjusted port version * Adjusted SHA for vcpkg x-add-version --all --------- Co-authored-by: Billy Robert O'Neal III <[email protected]>
Do not try to install file that does not exist. Fixes microsoft#31170 Signed-off-by: Frank Lichtenheld <[email protected]>
* [openssl] Use bash from PATH rather then /bin (microsoft#32288) The configure script used to invoke python during the build process contains a shebang that invokes /bin/bash independend of whatever bash would usually resolve to. This breaks compilation on FreeBSD, where bash isn't part of the operating system. Rather then /bin/bash, invoke /usr/bin/env bash, which resolves the bash command by iterating PATH * [openssl] regenerate versions registries (microsoft#32288)
* [openssl] update to 3.1.2 * update version --------- Co-authored-by: Zhao Liu <[email protected]>
* [openssl] Fix win64 perlasm scheme * CI
|
No just use |
fwcd
force-pushed
the
mixxx/merge-master-2.4
branch
from
5b79932
to
24914ee
Compare
fwcd
changed the title
master (into 2.4)2.4
|
Done |
daschuer
approved these changes
Aug 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation: Trying to debug Mixxx with a 2.4 env on arm64 macOS crashes at launch due to a bug in OpenSSL 3.1.0, which presumably has been fixed in 3.1.2:
While the 2.5 branch is already based on a more recent version of the upstream master (see #78), the 2.4 branch still uses the buggy version of OpenSSL, hence this PR which merges the upstream master that includes OpenSSL 3.1.2.