-
Notifications
You must be signed in to change notification settings - Fork 61
[RFC] Remove OpenSSL 1.x support #157
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.
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
Conversation
|
This definitely requires a TEST PR in SOF before merge. |
|
thesofproject/sof#7444 fails because (among others?) https://github.com/zephyrproject-rtos/docker-image/pkgs/container/zephyr-build v0.24 was still based on Ubuntu 20.04 |
|
The latest However it also has @aborisovich could you please upgrade Then this will be enough on the Linux side (TESTED!) EDIT: this has already been merged, not needed anymore. --- a/zephyr/docker-run.sh
+++ b/zephyr/docker-run.sh
@@ -54,7 +54,7 @@ main()
run_command()
{
- # zephyr-build:v0.24.13 has /opt/toolchains/zephyr-sdk-0.15.2
+ # zephyr-build:v0.26.1 has /opt/toolchains/zephyr-sdk-0.16.0
# https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags
#
# Keep this SDK version identical to the one in
@@ -63,7 +63,7 @@ run_command()
--workdir /zep_workspace \
$SOF_DOCKER_RUN \
--env REAL_CC --env http_proxy --env https_proxy \
- ghcr.io/zephyrproject-rtos/zephyr-build:v0.24.13 \
+ ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.1 \
./sof/scripts/sudo-cwd.sh "$@"
} |
| endif() | ||
|
|
||
| target_link_libraries(rimage PRIVATE crypto) | ||
| find_package(OpenSSL REQUIRED) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice!
Could you go one step further and try this? It should make openssl 1 fail faster and much more clearly.
| find_package(OpenSSL REQUIRED) | |
| find_package(OpenSSL 3...3.9999 REQUIRED) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would hopefully provide a much clearer error than the D:/a/sof/sof/workspace/sof/rimage/src/pkcs1_5.c:93:15: error: implicit declaration of function ‘EVP_PKEY_private_check’; did you mean ‘EVP_PKEY_param_check’? and similar found in https://github.com/thesofproject/sof/actions/runs/4830399599/jobs/8606585483?pr=7444
lgirdwood
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@juimonen any update ?
|
@lgirdwood not sure how we should test this.... @marc-hb any ideas? how could I use temporarily "test updated" build container, so to get all images signed with ssl3 and CI tested... |
|
@juimonen you can test this with my EDIT: this will NOT test everything because some systems may not use that script. But it will provide some testing and feedback. |
|
Linux build is OK but https://github.com/thesofproject/sof/actions/runs/4830399599/jobs/8606585483?pr=7444 looks like the Windows build misses OpenSSL3? @aborisovich can you help? |
|
Zephyr main branch is upgrading to Zephyr SDK 0.16.1 |
|
Great news: the Zephyr container has been upgraded to Ubuntu 22 by thesofproject/sof#7645 and we had some Windows updates too. @juimonen can you give this another try? |
|
@juimonen ping. |
|
@juimonen ping |
Remove OpenSSL 1.x support as it is reaching end-of-life in many distros. Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
|
@lgirdwood @marc-hb @aborisovich still not compiling for windows... not sure can it be somehow updated for ssl3? |
|
@mwasko @abonislawski @aborisovich SDL requires SSL3, need to update Windows. |
|
@marc-hb @fredoh9 @aiChaoSONG (put here everyone who might know about CI)... I tried this locally with both sof docker image and zephyr docker image, and it compiles in both -> means they have ssl3 support. However there is some errors still in some CI compilation (even outside windows builds)... Can someone take a look at thesofproject/sof#7444 results, so do we need to do still some CI update, so that we don't have any ssl1 things left? |
Yes, both the Jenkins nodes and Github Action for windows need some updates. |
|
@lgirdwood @mwasko @juimonen I will issue the appropriate ticket |
|
@alex-cri fyi. |
kv2019i
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Marking as -1, this needs to be resubmitted directly to SOF repo (rimage moved to sof/tools/rimage).
|
To easily move these commits to the main sof repo, see: |
Support unusual locations and prepares for OpenSSL 1 deprecation (as previously attempted in thesofproject/rimage#157) Signed-off-by: Marc Herbert <marc.herbert@intel.com>
Support unusual locations and deprecates OpenSSL 1 (as previously attempted in thesofproject/rimage#157) Will remove the OpenSSL 1 code later to give people some time to upgrade. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
|
|
||
| target_link_libraries(rimage PRIVATE crypto) | ||
| find_package(OpenSSL REQUIRED) | ||
| target_link_libraries(rimage PRIVATE crypto OpenSSL::SSL) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Smaller dependency enough:
| target_link_libraries(rimage PRIVATE crypto OpenSSL::SSL) | |
| target_link_libraries(rimage PRIVATE crypto OpenSSL::crypto) |
(OpenSSL::SSL depends on OpenSSL::crypto)
|
Filed new issue: |
Remove OpenSSL 1.x support as it is reaching end-of-life in many distros.