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.

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

Fix ssl3 #97

Merged
merged 2 commits into from
Jun 17, 2022
Merged

Fix ssl3 #97

merged 2 commits into from
Jun 17, 2022

Conversation

juimonen
Copy link

No description provided.

@aiChaoSONG
Copy link

SOF test PR to test this:thesofproject/sof#5928

Jaska Uimonen added 2 commits June 16, 2022 17:30
Fix a misunderstanding with openssl APIs and don't "double sign" the
binary.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
Ace signing functions need guards for not to use deprecated openssl
functions and thus fail the compilation. Openssl3 implementation
needs to be done as the added stub now returns just -EINVAL.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
src/pkcs1_5.c Outdated Show resolved Hide resolved
src/pkcs1_5.c Outdated Show resolved Hide resolved
@marc-hb
Copy link
Contributor

marc-hb commented Jun 16, 2022

Thanks @aiChaoSONG for submitting this to CI in test PR thesofproject/sof#5928.

Everyone note how it's possible to submit an unmerged rimage PR to SOF CI, explanations in the rimage README.

This bug was incredibly time-consuming: after this is merged and well tested over a couple weeks I think it should be backported to SOF release branches (which will require another bit of submodule-fu)

Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

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

We need to take this for v2.2, and we can readd the MTL support in the correct place for v2.3.

void *ptr1, unsigned int size1, void *ptr2,
unsigned int size2)
{
return -EINVAL;
Copy link
Member

Choose a reason for hiding this comment

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

@juimonen So IIUC, the code that should be here was removed in the previous patch becuase it was in the wrong place and caused FW to be signed twice ?
@mwasko @marcinszkudlinski it looks like we need the MTL code added here, the code is in the wrong place currently, so not new development just a code move and revalidate. Just checking incase you already have this fix ?

Copy link
Author

Choose a reason for hiding this comment

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

I had an misunderstanding in my own ver25 ssl3 code (first patch), ace functions we're not implemented for ssl3 at all -> I needed to make quick guards and stub (second patch), because git HEAD was not even compiling in systems with ssl3. So just wanted to fix tgl fast, I need to check the ace code later.

Copy link
Member

Choose a reason for hiding this comment

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

ok, lets merge this as correct SSL3 code and adapt MTL to follow the same flow when using SSL3.

@lgirdwood lgirdwood merged commit 02abc5d into thesofproject:main Jun 17, 2022
@lgirdwood
Copy link
Member

@juimonen can you send a PR to udate teh rimage submodule in SOF. Thanks !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants