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

radosgw: Make compilation with CryptoPP possible. #14955

Merged
merged 1 commit into from Nov 2, 2017

Conversation

Projects
None yet
3 participants
@aclamk
Copy link
Contributor

commented May 4, 2017

Signed-off-by: Adam Kupczyk akupczyk@mirantis.com

*/
extern "C"
{
bool SSL_CTX_set_ecdh_auto(void* dummy, int onoff)

This comment has been minimized.

Copy link
@tchaikov

tchaikov May 4, 2017

Contributor

thanks, this addresses the issue mentioned at #13315 (comment), but shall we just update the civetweb submodule?

This comment has been minimized.

Copy link
@aclamk

aclamk May 4, 2017

Author Contributor

@yehudasa I do not feel comfortable answering question about updating civetweb. Do we know if we can safely update civetweb to newer version?
@tchaikov I was not aware that this problem affects more then radosgw. In that case this code can be moved to some generic ceph parts like ceph_crypto.cc

This comment has been minimized.

Copy link
@tchaikov

tchaikov May 5, 2017

Contributor

@aclamk i think it's just rgw.

@liewegas

This comment has been minimized.

Copy link
Member

commented May 19, 2017

@aclamk

This comment has been minimized.

Copy link
Contributor Author

commented May 22, 2017

@yehudasa @tchaikov At RGW sync-up it was decided that we will not change civetweb for now. So, presented solution remains.

@aclamk aclamk force-pushed the aclamk:fix-civetweb-cryptopp branch from e7db6bc to 30974ea May 22, 2017

{
bool SSL_CTX_set_ecdh_auto(void* dummy, int onoff)
{
return onoff!=0;

This comment has been minimized.

Copy link
@tchaikov

tchaikov May 22, 2017

Contributor

please add spaces around !=.

This comment has been minimized.

Copy link
@aclamk

aclamk May 23, 2017

Author Contributor

@tchaikov done.

This comment has been minimized.

Copy link
@tchaikov

tchaikov Oct 10, 2017

Contributor

@aclamk this change is reverted somehow?

@@ -24,6 +24,24 @@
#include <cryptopp/cryptlib.h>
#include <cryptopp/modes.h>
#include <cryptopp/aes.h>
#if defined(CIVETWEB_VERSION_MAJOR) && defined(CIVETWEB_VERSION_MINOR) \
&& ((CIVETWEB_VERSION_MAJOR>=1 && CIVETWEB_VERSION_MINOR>=10) || \
(CIVETWEB_VERSION_MAJOR>1))

This comment has been minimized.

Copy link
@tchaikov

tchaikov Sep 16, 2017

Contributor

i think this line should be

   (CIVETWEB_VERSION_MAJOR>1))

but maybe following macro is easier to digest?

#if defined(CIVETWEB_VERSION_MAJOR) && \
    defined(CIVETWEB_VERSION_MINOR) &&
    (CIVETWEB_VERSION_MAJOR * 100) + CIVETWEB_VERSION_MINOR >= 110

This comment has been minimized.

Copy link
@aclamk

aclamk Sep 18, 2017

Author Contributor

@tchaikov Basically I like your solution better.

@tchaikov

This comment has been minimized.

Copy link
Contributor

commented Sep 18, 2017

@aclamk could you fold these two commits into a single one? then i think it'd be good to merge as long as shaman is happy.

radosgw: Make compilation with CryptoPP possible. Trigger compilation…
… error when CIVETWEB changes.

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>

@aclamk aclamk force-pushed the aclamk:fix-civetweb-cryptopp branch from c867f27 to 0050617 Sep 20, 2017

@tchaikov tchaikov merged commit 428c775 into ceph:master Nov 2, 2017

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.