From: Adam Kupczyk <akupczyk@mirantis.com>
Date: Thu, 4 May 2017 13:01:01 +0000 (+0200)
Subject: radosgw: Make compilation with CryptoPP possible. Trigger compilation error when... 
X-Git-Tag: v13.0.1~311^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14955%2Fhead;p=ceph.git

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

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

diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc
index 0d57f4da270a..ce4494cc00eb 100644
--- a/src/rgw/rgw_crypt.cc
+++ b/src/rgw/rgw_crypt.cc
@@ -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 * 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