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

Fix compile errors on s390. #14926

Closed
wants to merge 1 commit into from
Closed

Fix compile errors on s390. #14926

wants to merge 1 commit into from

Conversation

juergenchrist
Copy link
Contributor

Commit f6c95e4 added an "origin" field to
EVP_CIPHER and EVP_MD structures but did not update the s390 specific
implementations. Update these to fix compile errors on s390.

Signed-off-by: Juergen Christ jchrist@linux.ibm.com

Checklist

@t8m t8m added approval: review pending This pull request needs review by a committer branch: master Merge to master branch severity: urgent Fixes an urgent issue (exempt from 24h grace period) labels Apr 19, 2021
@t8m
Copy link
Member

t8m commented Apr 19, 2021

This is kind of urgent as it is a build breakage although not in our CI builds.

@juergenchrist
Copy link
Contributor Author

Hi, not sure what happened at this "external-tests" CI check, but it should not have anything to do with my change. Please advise if I should change anything or how to proceed with this problem.

Regarding urgency: Our CI caught this today. CI runs every night. So if we do not get this in today, our CI will pick it up later. So not need to hurry up (even though I would really like to have it in soon as to not "shadow" other problems on s390).

@t8m
Copy link
Member

t8m commented Apr 19, 2021

The external check failure is unrelated.

@t8m t8m added this to the 3.0.0 beta1 milestone Apr 19, 2021
@p-steuer p-steuer added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Apr 19, 2021
@t8m
Copy link
Member

t8m commented Apr 19, 2021 •
edited

Now I realized that this adds <TAB> characters instead of spaces. Can you please fix that?

@t8m t8m added approval: otc review pending This pull request needs review by an OTC member and removed approval: done This pull request has the required number of approvals labels Apr 19, 2021
@juergenchrist
Fix compile errors on s390.
a5fb33a 
Commit f6c95e4 added an "origin" field to
EVP_CIPHER and EVP_MD structures but did not update the s390 specific
implementations.  Update these to fix compile errors on s390.

Signed-off-by: Juergen Christ <jchrist@linux.ibm.com>
@juergenchrist
Copy link
Contributor Author

Fixed the tabs. Sorry, did not change the auto format for macros...

@t8m t8m added approval: done This pull request has the required number of approvals and removed approval: otc review pending This pull request needs review by an OTC member labels Apr 19, 2021
@t8m
Copy link
Member

t8m commented Apr 19, 2021

@p-steuer still OK?

@p-steuer
Copy link
Member

@p-steuer still OK?

yes !

@t8m t8m added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Apr 20, 2021
@t8m
Copy link
Member

t8m commented Apr 20, 2021

As this is urgent I am merging this now.

openssl-machine pushed a commit that referenced this pull request Apr 20, 2021
@juergenchrist @t8m
Fix compile errors on s390.
c39352e 
Commit f6c95e4 added an "origin" field to
EVP_CIPHER and EVP_MD structures but did not update the s390 specific
implementations.  Update these to fix compile errors on s390.

Signed-off-by: Juergen Christ <jchrist@linux.ibm.com>

Reviewed-by: Patrick Steuer <patrick.steuer@de.ibm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #14926)
@t8m
Copy link
Member

t8m commented Apr 20, 2021

Merged to master. Thank you for the contribution!

@t8m t8m closed this Apr 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t8m t8m t8m approved these changes

@paulidale paulidale paulidale approved these changes

@p-steuer p-steuer p-steuer approved these changes

Assignees
No one assigned
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch severity: urgent Fixes an urgent issue (exempt from 24h grace period)
Projects
None yet
Milestone
3.0.0 beta1
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@juergenchrist @t8m @p-steuer @paulidale