Skip to content

Fix test failure in OpenSSL#3368

Merged
Camelron merged 2 commits intomicrosoft:mainfrom
mamckee:mamckee/openssl_patch_fix
Aug 2, 2022
Merged

Fix test failure in OpenSSL#3368
Camelron merged 2 commits intomicrosoft:mainfrom
mamckee:mamckee/openssl_patch_fix

Conversation

@mamckee
Copy link
Contributor

@mamckee mamckee commented Jul 13, 2022

Merge Checklist
  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/tools/cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

This PR removes the patch to crypto/engine/eng_all.c in OpenSSL, introduced in #3182. This section of the patch was introduced to make loading the SymCrypt and KeysInUse engines more reliable; however, this code path caused extra errors to be generated during the test_shlibload and test_includes unit tests.

While the errors don't impact normal operation of OpenSSL, I am removing this code until the cause is understood. I have performed a full, clean rebuild of the OpenSSL package with RUN_CHECK=y to confirm the issue no longer repros.

Change Log
  • Removed patch to crypto/engine/eng_all.c from SPECS/openssl/openssl-1.1.1-load-default-engines.patch
Does this affect the toolchain?

YES

Test Methodology
  • Local build
    • Clean with RUN_CHECK=y
    • Verified tests passed from pkggen logs

@mamckee mamckee requested a review from a team as a code owner July 13, 2022 18:47
@ghost ghost added Packaging main PR Destined for main labels Jul 13, 2022
mfrw
mfrw previously approved these changes Jul 14, 2022
@mfrw mfrw dismissed their stale review July 14, 2022 05:56

Have a clarification question.

@danmihai1
Copy link
Contributor

My understanding is that the toolchain*.txt changes mean that this change should be marked as:

Does this affect the toolchain? YES.

Looks reasonable to me otherwise.

@danmihai1 danmihai1 self-requested a review July 14, 2022 16:33
@Camelron Camelron merged commit 10c3a29 into microsoft:main Aug 2, 2022
@mamckee mamckee deleted the mamckee/openssl_patch_fix branch April 24, 2024 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants