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] Update to 1.1.1k #16937

Merged
merged 3 commits into from
Apr 30, 2021
Merged

[OpenSSL] Update to 1.1.1k #16937

merged 3 commits into from
Apr 30, 2021

Conversation

metsma
Copy link
Contributor

@metsma metsma commented Mar 29, 2021 •
edited by NancyLi1013
Loading

Security fixes for CVE-2021-3450 and CVE-2021-3449
https://www.openssl.org/news/vulnerabilities.html
Use similar configure log file pattern as build log

Signed-off-by: Raul Metsma raul@metsma.ee

Fixed #17233

@NancyLi1013 NancyLi1013 self-assigned this Mar 30, 2021
@NancyLi1013 NancyLi1013 added the category:port-update The issue is with a library, which is requesting update new revision label Mar 30, 2021
@NancyLi1013
Copy link
Contributor

Hi @metsma
Thanks for your PR.

The failures on x86-windows like this:

CMake Error at CMakeLists.txt:377 (message):
  Must be able to find shared_ptr

@metsma
Copy link
Contributor Author

metsma commented Mar 30, 2021

OpenSSL is pure C and this is C++ class. Are you sure this error comes from OpenSSL

@NancyLi1013
Copy link
Contributor

The error is from coolprop:

-- Found PythonInterp: D:/downloads/tools/python/python-2.7.16-x86/python.exe (found suitable version "2.7.16", minimum required is "2.7") 
-- Looking for C++ include memory
-- Looking for C++ include memory - not found
-- Looking for C++ include tr1/memory
-- Looking for C++ include tr1/memory - not found
CMake Error at CMakeLists.txt:377 (message):
  Must be able to find shared_ptr


-- Configuring incomplete, errors occurred!

I tried to build this port on my machine and it can be built successfully.

Comparing with the configure log, I found something different:

-- Found PythonInterp: F:/16937/vcpkg/downloads/tools/python/python-2.7.16-x86/python.exe (found suitable version "2.7.16", minimum required is "2.7") 
-- Looking for C++ include memory
-- Looking for C++ include memory - found
-- Performing Test HAVE_SHARED_PTR_IN_STD_NAMESPACE
-- Performing Test HAVE_SHARED_PTR_IN_STD_NAMESPACE - Success
-- Found shared_ptr in std namespace using <memory> header.

So the root cause seems that memory cannot be found on CI test machine.

@PhoebeHui
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Hoikas Hoikas mentioned this pull request Apr 12, 2021
Closed
@NancyLi1013 NancyLi1013 mentioned this pull request Apr 13, 2021
Closed
@NancyLi1013
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor

The failures caused by popsift will be fixed by #17277.

@NancyLi1013
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Apr 16, 2021
@NancyLi1013
Copy link
Contributor

LGTM, thanks for your update @metsma.

@IceCodeNew
Copy link

IceCodeNew commented Apr 18, 2021 •
edited
Loading

ping
@NancyLi1013

@Hoikas
Copy link
Contributor

Hoikas commented Apr 24, 2021

IMO This should be a priority over all other openssl port updates, considering the security content...

@NancyLi1013
Copy link
Contributor

@metsma

Could you please resolve the conflicts in this PR?

@metsma
[OpenSSL] Update to 1.1.1k
28428a9 
Signed-off-by: Raul Metsma <raul@metsma.ee>
@metsma
Update JSON file
84fc43f 
Signed-off-by: Raul Metsma <raul@metsma.ee>
@shiena shiena mentioned this pull request Apr 25, 2021
Closed
@metsma
Copy link
Contributor Author

metsma commented Apr 25, 2021

Conflict resolved

@IceCodeNew
Copy link

Will the failed check block this PR?
I see the marble somehow failed compiled in two different checks.

@Hoikas
Copy link
Contributor

Hoikas commented Apr 26, 2021

The failure seems to be fixed by #17492.

@NancyLi1013 NancyLi1013 added the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 26, 2021
@NancyLi1013
Copy link
Contributor

Will the failed check block this PR?
I see the marble somehow failed compiled in two different checks.

This failure is not related with this PR, but we need to wait for the PR #17492 merged. I will rerun this PR once solved.

@metsma
Copy link
Contributor Author

metsma commented Apr 28, 2021

It has been already month? How long takes to merge CVE fixes?

@NancyLi1013
Copy link
Contributor

It has been already month? How long takes to merge CVE fixes?

Sorry for the long delay. Currently, we need to wait for PR #17492 merged.

@Hoikas Hoikas mentioned this pull request Apr 29, 2021
Merged
@NancyLi1013
Copy link
Contributor

/azp run

@NancyLi1013 NancyLi1013 removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 29, 2021
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor

@strega-nil , @BillyONeal

Could you please help merge this PR?

Thanks.

@strega-nil-ms
Copy link
Contributor

Thanks @metsma, this is great :)

@strega-nil-ms strega-nil-ms merged commit 85308d1 into microsoft:master Apr 30, 2021
@metsma metsma deleted the openssl branch April 30, 2021 18:43
@lstipakov lstipakov mentioned this pull request Jun 16, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NancyLi1013 NancyLi1013 NancyLi1013 approved these changes

Assignees

@NancyLi1013 NancyLi1013

Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[OpenSSL] update to 1.1.1k
7 participants
@metsma @NancyLi1013 @PhoebeHui @IceCodeNew @Hoikas @strega-nil-ms @BillyONeal