Conversation
Signed-off-by: Matthias Aßhauer <mha1993@live.de>
OpenSSL 3.5.6 includes upstream commit ebd4371fc542 ("Disable DLL
detach handlers on cygwin", merged via
openssl/openssl#29321) which adds the same
`#ifndef __CYGWIN__` guards in `crypto/dllmain.c` and
`providers/fips/self_test.c` that our patch was carrying. Applying
the now-redundant patch on top of the already-guarded code causes
both hunks to fail, which broke the CI build for both x86_64 and
i686.
Assisted-by: Claude Opus 4.6
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Member
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
2 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.
This closes git-for-windows/git#6160