Skip to content

Update magick plugin to OpenSSL 1.1.1 API #11441

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
Merged
JosiahWI merged 5 commits into from
Jun 12, 2024
Merged

Update magick plugin to OpenSSL 1.1.1 API #11441

JosiahWI merged 5 commits into from
Jun 12, 2024
+28 −23

Conversation

@JosiahWI
Copy link
Contributor

@JosiahWI JosiahWI commented Jun 11, 2024

The functions EVP_MD_CTX_create and EVP_MD_CTX_destroy were renamed to EVP_MD_CTX_new and EVP_MD_CTX_free in OpenSSL 1.1.0. This renames them in the magick plugin accordingly. This also replaces the individual calls to EVP_DigestVerifyUpdate and EVP_DigestVerifyFinal with a single call to EVP_DigestVerify which is available in OpenSSL 1.1.1.

@JosiahWI
Update magick plugin to OpenSSL 1.1.1 API
d3cd659 
The functions `EVP_MD_CTX_create` and `EVP_MD_CTX_destroy` were renamed to
`EVP_MD_CTX_new` and `EVP_MD_CTX_free` in OpenSSL 1.1.0. This renames them
in the magick plugin accordingly. This also replaces the individual calls
to `EVP_DigestVerifyUpdate` and `EVP_DigestVerifyFinal` with a single call
to `EVP_DigestVerify` which is available in OpenSSL 1.1.1.
@JosiahWI JosiahWI added this to the 10.1.0 milestone Jun 11, 2024
@JosiahWI JosiahWI self-assigned this Jun 11, 2024
@JosiahWI
Copy link
Contributor Author

JosiahWI commented Jun 11, 2024 •
edited
Loading

LSan detected a leak in the magick plugin and the AuTest prefetch_simple failed:

   Run: 2-tr: Failed
     Starting TestRun 2-tr : No Issues found - Passed
        Reason: Started!
     Process: Default: Failed
       Test : Checking that ReturnCode == 0 - Passed
          Reason: Returned Value: 0 == 0
       file /tmp/sandbox/prefetch_simple/_output/2-tr-Default/stream.stdout.txt : Checking that /tmp/sandbox/prefetch_simple/_output/2-tr-Default/stream.stdout.txt matches prefetch_simple.gold - Failed
          Reason: File differences
           Gold File : /home/jenkins/workspace/Github_Builds/autest/src/tests/gold_tests/pluginTest/prefetch/prefetch_simple.gold
           Data File : /tmp/sandbox/prefetch_simple/_output/2-tr-Default/stream.stdout.txt
             GET http://domain.in/texts/demo-1.txt HTTP/1.1
             GET http://domain.in/texts/demo-2.txt HTTP/1.1
             GET http://domain.in/texts/demo-3.txt HTTP/1.1
           - GET http://domain.in/texts/demo-4.txt HTTP/1.1

Note: the leak report was different this time and didn't indicate libssl as the issue but rather an unknown module.

maskit
maskit reviewed Jun 11, 2024
View reviewed changes
@JosiahWI
Copy link
Contributor Author

JosiahWI commented Jun 11, 2024 •
edited
Loading

LSan detected a leak in the magick plugin three more times.

@JosiahWI JosiahWI requested a review from maskit June 11, 2024 18:38
bneradt
bneradt reviewed Jun 11, 2024
View reviewed changes
Copy link
Contributor

@bneradt bneradt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable to me.

@JosiahWI JosiahWI requested a review from bneradt June 12, 2024 01:30
@JosiahWI JosiahWI merged commit 0d3a5f3 into apache:master Jun 12, 2024
@JosiahWI JosiahWI deleted the refactor/magick-update-ssl-usage branch June 13, 2024 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@maskit maskit maskit approved these changes

@bneradt bneradt bneradt approved these changes

Assignees

@JosiahWI JosiahWI

Labels

magick

Projects

None yet

Milestone

10.1.0

Development

Successfully merging this pull request may close these issues.

3 participants

@JosiahWI @maskit @bneradt