Skip to content

rgw: switch AES_256_{CBC, ECB_encrypt} from NSS to OpenSSL#27659

Closed
rzarzynski wants to merge 4 commits intoceph:masterfrom
rzarzynski:wip-nss-drop_from_rgw_kms
Closed

rgw: switch AES_256_{CBC, ECB_encrypt} from NSS to OpenSSL#27659
rzarzynski wants to merge 4 commits intoceph:masterfrom
rzarzynski:wip-nss-drop_from_rgw_kms

Conversation

@rzarzynski
Copy link
Contributor

@rzarzynski rzarzynski commented Apr 17, 2019

After this patchset gets in, the last NSS user will be the legacy PKI token support of Keystone.

UPDATE: PKI/PKIz tokens have been dropped in 2016 from Keystone. See openstack/keystone@8a66ef6.

Copy link
Contributor

@mattbenjamin mattbenjamin left a comment

Choose a reason for hiding this comment

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

defer to marcus, but looks sane

#ifdef USE_OPENSSL
# include <openssl/evp.h>
#endif // USE_OPENSSL

Copy link
Contributor

Choose a reason for hiding this comment

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

#else/#elif?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed by keeping the #else clause we had for NSS.

const unsigned char* const iv,
const unsigned char* const key,
const bool encrypt)
{
Copy link
Contributor

Choose a reason for hiding this comment

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

is line continuation needed here?

Copy link
Contributor

Choose a reason for hiding this comment

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

oh, it's not new anyway, sorry

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean new line before the bracket? I tried to be consistent with closest neighborhood but I stay open to reformatting entire file.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
@rzarzynski rzarzynski force-pushed the wip-nss-drop_from_rgw_kms branch from 448e50f to 6111ce0 Compare April 18, 2019 13:36
@cbodley
Copy link
Contributor

cbodley commented May 7, 2019

looks good to me, and passing tests. ping @mdw-at-linuxbox

@rzarzynski
Copy link
Contributor Author

It's worth to mention that #27834 is built on top of these patches. In contrast to the broader PR, changes here are focused solely on RGW. This can help with reviewing both of them, I hope.

@stale
Copy link

stale bot commented Jul 6, 2019

This pull request has been automatically marked as stale because it has not had any activity for 60 days. It will be closed if no further activity occurs for another 30 days.
If you are a maintainer or core committer, please follow-up on this pull request to identify what steps should be taken by the author to move this proposed change forward.
If you are the author of this pull request, thank you for your proposed contribution. If you believe this change is still appropriate, please ensure that any feedback has been addressed and ask for a code review.

@stale stale bot added the stale label Jul 6, 2019
@rzarzynski
Copy link
Contributor Author

Closing as #27834 has been merged!

@rzarzynski rzarzynski closed this Jul 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants