Skip to content

Add Common shared code needed to move aes ciphers to providers#9301

Closed
slontis wants to merge 6 commits intoopenssl:masterfrom
slontis:prov_aes_shared_changes
Closed

Add Common shared code needed to move aes ciphers to providers#9301
slontis wants to merge 6 commits intoopenssl:masterfrom
slontis:prov_aes_shared_changes

Conversation

@slontis
Copy link
Member

@slontis slontis commented Jul 3, 2019

Custom aes ciphers will be placed into multiple new files
(instead of the monolithic setup used in the e_aes.c legacy code)
so it makes sense to have a header for the platform specific
code that needs to be shared between files.
modes_lcl.h has also moved to modes_int.h to allow sharing with the
provider source.
Code that will be common to AEAD ciphers has also been added. These
will be used by seperate PR's for GCM, CCM & OCB.

Checklist
  • documentation is added or updated
  • tests are added or updated

@slontis
Copy link
Member Author

slontis commented Jul 3, 2019

#9231 & #9280 will be dependent on this PR.

Copy link
Member

@mattcaswell mattcaswell left a comment

Choose a reason for hiding this comment

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

Travis failures look relevant.

slontis added 3 commits July 12, 2019 15:32
Custom aes ciphers will be placed into multiple new files
(instead of the monolithic setup used in the e_aes.c legacy code)
so it makes sense to have a header for the platform specific
code that needs to be shared between files.
modes_lcl.h has also moved to modes_int.h to allow sharing with the
provider source.
Code that will be common to AEAD ciphers has also been added. These
will be used by seperate PR's for GCM, CCM & OCB.
@slontis slontis force-pushed the prov_aes_shared_changes branch from 309e193 to 355ff6e Compare July 12, 2019 05:50
@slontis
Copy link
Member Author

slontis commented Jul 12, 2019

@levitte I have changed the code just introduced in #9328.
It still uses your support functions / just not the one that passes in the function pointers.
I think its clearer, and is a similar number of lines of code.

@levitte
Copy link
Member

levitte commented Jul 12, 2019

@levitte I have changed the code just introduced in #9328.
It still uses your support functions / just not the one that passes in the function pointers.
I think its clearer, and is a similar number of lines of code.

Sure, no problem.

Copy link
Member

@mattcaswell mattcaswell left a comment

Choose a reason for hiding this comment

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

LGTM. Approved assuming the minor nit is fixed.

@slontis
Copy link
Member Author

slontis commented Jul 12, 2019

@levitte are you happy with these changes?

Copy link
Member

@levitte levitte left a comment

Choose a reason for hiding this comment

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

Not quite happy with how things are moving around

@slontis slontis force-pushed the prov_aes_shared_changes branch from 29a21a7 to bd476b3 Compare July 15, 2019 10:00
@slontis slontis force-pushed the prov_aes_shared_changes branch from bd476b3 to 181087f Compare July 15, 2019 10:47
@levitte
Copy link
Member

levitte commented Jul 15, 2019

Speaking of our dispute over modes_int.h, do you plan to move all of crypto/modes to providers?

@slontis
Copy link
Member Author

slontis commented Jul 15, 2019

Speaking of our dispute over modes_int.h, do you plan to move all of crypto/modes to providers?

Until we can completely remove most of e_aes.c I dont know that it makes much difference..

@slontis slontis added branch: master Applies to master branch approval: done This pull request has the required number of approvals labels Jul 15, 2019
slontis added a commit to slontis/openssl that referenced this pull request Jul 16, 2019
Custom aes ciphers will be placed into multiple new files
(instead of the monolithic setup used in the e_aes.c legacy code)
so it makes sense to have a header for the platform specific
code that needs to be shared between files.
modes_lcl.h has also moved to modes_int.h to allow sharing with the
provider source.
Code that will be common to AEAD ciphers has also been added. These
will be used by seperate PR's for GCM, CCM & OCB.

Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Richard Levitte <[email protected]>
(Merged from openssl#9301)
@levitte
Copy link
Member

levitte commented Jul 19, 2019

The dangers of waiting too long to actually merge the PR... please do rebase

@slontis
Copy link
Member Author

slontis commented Jul 19, 2019

It has been merged already. Forgot to close it.. Thanks

@slontis slontis closed this Jul 19, 2019
@levitte
Copy link
Member

levitte commented Jul 19, 2019

Ah! yeah that went unnoticed. I would like to encourage you to write something when you do merge. You do not have to do what I do (I dump a oneline log of all final commits), but something would be good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: done This pull request has the required number of approvals branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants