]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw: Make compilation with CryptoPP possible. Trigger compilation error when... 14955/head
authorAdam Kupczyk <akupczyk@mirantis.com>
Thu, 4 May 2017 13:01:01 +0000 (15:01 +0200)
committerAdam Kupczyk <akupczyk@redhat.com>
Wed, 20 Sep 2017 07:23:37 +0000 (09:23 +0200)
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
src/rgw/rgw_crypt.cc

index 0d57f4da270a305d32549885e56d553f512a2d9c..ce4494cc00ebb9708a620d1d830c7ceb3d1cc737 100644 (file)
 #include <cryptopp/cryptlib.h>
 #include <cryptopp/modes.h>
 #include <cryptopp/aes.h>
+#if defined(CIVETWEB_VERSION_MAJOR) && \
+    defined(CIVETWEB_VERSION_MINOR) && \
+    (CIVETWEB_VERSION_MAJOR * 100) + CIVETWEB_VERSION_MINOR >= 110
+#error SSL_CTX_set_ecdh_auto patch no longer needed. Please delete.
+#else
+/*
+ * patching for https://github.com/openssl/openssl/issues/1437
+ * newer versions of civetweb do not experience problems
+ */
+extern "C"
+{
+bool SSL_CTX_set_ecdh_auto(void* dummy, int onoff)
+{
+  return onoff!=0;
+}
+}
+#endif
+
 using namespace CryptoPP;
 #endif