Restore correct registers in aarch64 AES-CTR code#26469
Closed
julian-klode wants to merge 1 commit intoopenssl:masterfrom
Closed
Restore correct registers in aarch64 AES-CTR code#26469julian-klode wants to merge 1 commit intoopenssl:masterfrom
julian-klode wants to merge 1 commit intoopenssl:masterfrom
Conversation
439a93b to
fe7b532
Compare
Commit 1d1ca79 introduced save and restore for the registers, saving them as stp d8,d9,[sp, openssl#16] stp d10,d11,[sp, openssl#32] stp d12,d13,[sp, openssl#48] stp d14,d15,[sp, openssl#64] But the restore code was inadvertently typoed: ldp d8,d9,[sp, openssl#16] ldp d10,d11,[sp, openssl#32] ldp d12,d13,[sp, openssl#48] ldp d15,d16,[sp, openssl#64] Restoring [sp, openssl#64] into d15,d16 instead of d14,d15. Fixes: openssl#26466 CLA: trivial
fe7b532 to
f77b152
Compare
kroeckx
approved these changes
Jan 18, 2025
Contributor
Author
|
The cmac test failure is surprising, it's possible something after the restore is accidentally working with the wrong values only or something, I'll need to have a closer look at that but it's getting late, I'll leave that for the following day(s). |
t8m
approved these changes
Jan 20, 2025
Member
t8m
left a comment
There was a problem hiding this comment.
This needs to go all the way into 3.4 and 3.3 branches.
Member
|
@paulidale @kroeckx please confirm you're OK with backporting to 3.3 and 3.4. |
Contributor
|
Fine with backporting. |
Member
|
Of course this should go to all affected branches.
|
Collaborator
|
24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually. |
Member
|
Merged to the master, 3.4 and 3.3 branches. Thank you for your contribution. |
openssl-machine
pushed a commit
that referenced
this pull request
Jan 21, 2025
Commit 1d1ca79 introduced save and restore for the registers, saving them as stp d8,d9,[sp, #16] stp d10,d11,[sp, #32] stp d12,d13,[sp, #48] stp d14,d15,[sp, #64] But the restore code was inadvertently typoed: ldp d8,d9,[sp, #16] ldp d10,d11,[sp, #32] ldp d12,d13,[sp, #48] ldp d15,d16,[sp, #64] Restoring [sp, #64] into d15,d16 instead of d14,d15. Fixes: #26466 CLA: trivial Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #26469)
openssl-machine
pushed a commit
that referenced
this pull request
Jan 21, 2025
Commit 1d1ca79 introduced save and restore for the registers, saving them as stp d8,d9,[sp, #16] stp d10,d11,[sp, #32] stp d12,d13,[sp, #48] stp d14,d15,[sp, #64] But the restore code was inadvertently typoed: ldp d8,d9,[sp, #16] ldp d10,d11,[sp, #32] ldp d12,d13,[sp, #48] ldp d15,d16,[sp, #64] Restoring [sp, #64] into d15,d16 instead of d14,d15. Fixes: #26466 CLA: trivial Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #26469) (cherry picked from commit 5261f3c)
openssl-machine
pushed a commit
that referenced
this pull request
Jan 21, 2025
Commit 1d1ca79 introduced save and restore for the registers, saving them as stp d8,d9,[sp, #16] stp d10,d11,[sp, #32] stp d12,d13,[sp, #48] stp d14,d15,[sp, #64] But the restore code was inadvertently typoed: ldp d8,d9,[sp, #16] ldp d10,d11,[sp, #32] ldp d12,d13,[sp, #48] ldp d15,d16,[sp, #64] Restoring [sp, #64] into d15,d16 instead of d14,d15. Fixes: #26466 CLA: trivial Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #26469) (cherry picked from commit 5261f3c)
Merged
13 tasks
Merged
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit 1d1ca79 introduced save and restore for the registers, saving them as
But the restore code was inadvertently typoed:
Restoring
[sp, #64]intod15,d16instead ofd14,d15.Fixes: #26466
Checklist