Build fix for CentOS 5

refs #11292

diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp
index 057fc1840f761a029e3886d1bb2ce6eb02ddd336..fc31d3990076f3b58b63e81d477edb8d7aed0bf2 100644 (file)
--- a/lib/base/tlsutility.cpp
+++ b/lib/base/tlsutility.cpp
@@ -193,11 +193,16 @@ void SetTlsProtocolminToSSLContext(const boost::shared_ptr<SSL_CTX>& context, co
 
        flags |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
 
+#ifdef SSL_TXT_TLSV1_1
        if (tlsProtocolmin == SSL_TXT_TLSV1_1)
                flags |= SSL_OP_NO_TLSv1;
-       else if (tlsProtocolmin == SSL_TXT_TLSV1_2)
+       else
+#elif defined(SSL_TXT_TLSV1_2)
+       if (tlsProtocolmin == SSL_TXT_TLSV1_2)
                flags |= SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1;
-       else if (tlsProtocolmin != SSL_TXT_TLSV1)
+       else
+#endif /* SSL_TXT_TLSV1_2 */
+       if (tlsProtocolmin != SSL_TXT_TLSV1)
                BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid TLS protocol version specified."));
 
        SSL_CTX_set_options(context.get(), flags);

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 007cfb9a85c963ba1b3959edfd573e458fce9fa3..424c63004965503c4abe4e09b48259b63528d385 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -1184,10 +1184,18 @@ void ApiListener::ValidateTlsProtocolmin(const String& value, const ValidationUt
 {
        ObjectImpl<ApiListener>::ValidateTlsProtocolmin(value, utils);
 
-       if (value != SSL_TXT_TLSV1 && value != SSL_TXT_TLSV1_1 &&
-           value != SSL_TXT_TLSV1_2) {
+       if (value != SSL_TXT_TLSV1
+#ifdef SSL_TXT_TLSV1_1
+           && value != SSL_TXT_TLSV1_1 &&
+           value != SSL_TXT_TLSV1_2
+#endif /* SSL_TXT_TLSV1_1 */
+           ) {
                BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("tls_protocolmin"), "Invalid TLS version. "
-                   "Must be one of '" SSL_TXT_TLSV1 "', '" SSL_TXT_TLSV1_1 "' or '" SSL_TXT_TLSV1_2 "'"));
+                   "Must be one of '" SSL_TXT_TLSV1 "'"
+#ifdef SSL_TXT_TLSV1_1
+                   ", '" SSL_TXT_TLSV1_1 "' or '" SSL_TXT_TLSV1_2 "'"
+#endif /* SSL_TXT_TLSV1_1 */
+                   ));
        }
 }