HPCC-12073 Can't build without openssl

Modify cmake and source files to allow build without openssl

common/remote/CMakeLists.txt

@@ -66,6 +66,11 @@ install ( TARGETS remote RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${L
 target_link_libraries ( remote 
     jlib 
     mp
-    securesocket
     ${URIPARSER_LIBRARIES}
     )
+
+IF (USE_OPENSSL)
+    target_link_libraries ( remote 
+    	securesocket
+    )
+ENDIF()

common/remote/sockfile.cpp

@@ -190,6 +190,7 @@ public:
 static CriticalSection              secureContextCrit;
 static Owned<ISecureSocketContext>  secureContext;
 
+#ifdef USE_OPENSSL
 static ISecureSocket *createSecureSocket(ISocket *sock,SecureSocketType type)
 {
     {
@@ -208,6 +209,7 @@ static ISecureSocket *createSecureSocket(ISocket *sock,SecureSocketType type)
     return secureContext->createSecureSocket(sock);
 #endif
 }
+#endif
 
 void clientSetRemoteFileTimeouts(unsigned maxconnecttime,unsigned maxreadtime)
 {
@@ -889,11 +891,15 @@ class CRemoteBase: public CInterface
                     socket.setown(ISocket::connect(ep));
                 if (useSSL)
                 {
+#ifdef USE_OPENSSL
                     Owned<ISecureSocket> ssock = createSecureSocket(socket.getClear(), ClientSocket);
                     int status = ssock->secure_connect();
                     if (status < 0)
                         throw createDafsException(DAFSERR_connection_failed,"Failure to establish secure connection");
                     socket.setown(ssock.getLink());
+#else
+                    throw createDafsException(DAFSERR_connection_failed,"Failure to establish secure connection: OpenSSL disabled in build");
+#endif
                 }
             }
             catch (IJSOCK_Exception *e) {
@@ -5013,11 +5019,15 @@ public:
                     sock.setown(acceptsock->accept(true));
                     if (useSSL)
                     {
+#ifdef USE_OPENSSL
                         Owned<ISecureSocket> ssock = createSecureSocket(sock.getClear(), ServerSocket);
                         int status = ssock->secure_accept();
                         if (status < 0)
                             throw createDafsException(DAFSERR_connection_failed,"Failure to establish secure connection");
                         sock.setown(ssock.getLink());
+#else
+                        throw createDafsException(DAFSERR_connection_failed,"Failure to establish secure connection: OpenSSL disabled in build");
+#endif
                     }
                     if (!sock||stopping)
                         break;

common/thorhelper/CMakeLists.txt

@@ -98,8 +98,12 @@ target_link_libraries ( thorhelper
          eclrtl 
          roxiemem
          deftype 
-         securesocket 
          dalibase 
     )
 
 
+IF (USE_OPENSSL)
+    target_link_libraries ( thorhelper 
+    	securesocket
+    )
+ENDIF()

common/thorhelper/thorsoapcall.cpp

@@ -937,6 +937,7 @@ public:
         return error.getLink();
     }
     inline IEngineRowAllocator * queryOutputAllocator() const { return outputAllocator; }
+#ifdef USE_OPENSSL
     ISecureSocket *createSecureSocket(ISocket *sock)
     {
         {
@@ -951,6 +952,7 @@ public:
         }
         return secureContext->createSecureSocket(sock);
     }
+#endif
     bool isTimeLimitExceeded(unsigned *_remainingMS)
     {
         if (timeLimitMS != WAIT_FOREVER)
@@ -1772,6 +1774,7 @@ public:
                     socket.setown(blacklist->connect(connUrl.port, connUrl.host, master->logctx, (unsigned)master->maxRetries, master->timeoutMS, master->roxieAbortMonitor));
                     if (stricmp(url.method, "https") == 0)
                     {
+#ifdef USE_OPENSSL
                         Owned<ISecureSocket> ssock = master->createSecureSocket(socket.getClear());
                         if (ssock) 
                         {
@@ -1787,6 +1790,13 @@ public:
                             }
                             socket.setown(ssock.getLink());
                         }
+#else
+                        StringBuffer err;
+                        err.append("Failure to establish secure connection to ");
+                        connUrl.getUrlString(err);
+                        err.append(": OpenSSL disabled in build");
+                        throw MakeStringExceptionDirect(0, err.str());
+#endif
                     }
                     break;
                 }

deployment/configgen/CMakeLists.txt

@@ -45,7 +45,10 @@ target_link_libraries ( configgen
         deploy 
         jlib 
         environment 
-        securesocket      
         )
 
-
+IF (USE_OPENSSL)
+    target_link_libraries ( configgen
+    	securesocket
+    )
+ENDIF()

deployment/deploy/CMakeLists.txt

@@ -62,10 +62,15 @@ target_link_libraries ( deploy
          jlib 
          environment 
          xmllib 
-         securesocket
          configutils
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( deploy 
+    	securesocket
+    )
+ENDIF()
+
 if ( PLATFORM )
     install ( PROGRAMS configesp.install DESTINATION etc/init.d/install COMPONENT Runtime )
     install ( PROGRAMS configesp.uninstall DESTINATION etc/init.d/uninstall COMPONENT Runtime )

deployment/deploy/DeploymentEngine.cpp

@@ -1813,8 +1813,10 @@ void CDeploymentEngine::setXsl(IXslProcessor* processor, IXslTransform* transfor
    m_externalFunction.setown(m_transform->createExternalFunction("addDeploymentFile", addDeploymentFile));
    m_transform->setExternalFunction(SEISINT_NAMESPACE, m_externalFunction.get(), true);
 
+#ifdef USE_OPENSSL
    m_externalFunction2.setown(m_transform->createExternalFunction("siteCertificate", siteCertificateFunction));
    m_transform->setExternalFunction(SEISINT_NAMESPACE, m_externalFunction2.get(), true);
+#endif
 }
 
 //---------------------------------------------------------------------------
@@ -2355,6 +2357,7 @@ void CDeploymentEngine::addDeploymentFile(StringBuffer &ret, const char *in, IXs
 //  siteCertificate
 //---------------------------------------------------------------------------
 /*static*/
+#ifdef USE_OPENSSL
 void CDeploymentEngine::siteCertificateFunction(StringBuffer &ret, const char *in, IXslTransform*)
 {
     //input is of the format <processType>+<process name>+<instance name>+<output path>
@@ -2382,7 +2385,7 @@ void CDeploymentEngine::siteCertificateFunction(StringBuffer &ret, const char *i
 
     s_xsltDepEngine->siteCertificate( *pProcess, instanceName, outputFile );
 }
-
+#endif
 
 //---------------------------------------------------------------------------
 //  processCustomMethod
@@ -2399,9 +2402,15 @@ void CDeploymentEngine::processCustomMethod(const char* method, const char *sour
         throw MakeStringException(0, "Process '%s': invalid method '%s' specified for file '%s'",
         m_name.get(), method, fileName);
 
+#ifdef USE_OPENSSL
     siteCertificate(m_process, instanceName, outputFile);
+#else
+    throw MakeStringException(0, "Process '%s' file '%s' method '%s': requires OpenSSL (disabled in build)",
+        m_name.get(), fileName, method);
+#endif
 }
 
+#ifdef USE_OPENSSL
 //---------------------------------------------------------------------------
 //  processCustomMethod
 //---------------------------------------------------------------------------
@@ -2616,7 +2625,7 @@ void CDeploymentEngine::siteCertificate(IPropertyTree& process, const char *inst
         s_dynamicFileList.push_back(LinkedFilePtr(pInstallFile2.get()));
     }
 }
-
+#endif
 
 bool CDeploymentEngine::fireException(IException *e)
 {

deployment/deploy/DeploymentEngine.hpp

@@ -244,7 +244,9 @@ protected:
         EnvMachineOS os=MachineOsUnknown, const char* processName=NULL,bool isEspModuleOrPlugin=false);
    virtual void processCustomMethod(const char *method, const char *source, const char *outputFile, 
                                     const char *instanceName, EnvMachineOS os);
+#ifdef USE_OPENSSL
    virtual void siteCertificate(IPropertyTree& process, const char *instanceName, const char *outputFile);
+#endif
 
    StringBuffer getHostRoot(const char* computer, const char* dir, bool bIgnoreDepToFolder=false) const;
    StringBuffer getHostDir(IPropertyTree& node, bool bIgnoreDepToFolder=false);
@@ -287,7 +289,9 @@ protected:
                                    EnvMachineOS os, bool bCacheable, 
                                    const char* params=NULL);
    static void addDeploymentFile(StringBuffer &ret, const char *in, IXslTransform*);
+#ifdef USE_OPENSSL
    static void siteCertificateFunction(StringBuffer &ret, const char *in, IXslTransform*);
+#endif
    virtual IEnvDeploymentEngine& getEnvDepEngine() const { return m_envDepEngine; }
    virtual IDeploymentCallback& getCallback() const { return *m_pCallback; }
      void copyInstallFiles(const char* instanceName, int instanceIndex, const char* destPath, EnvMachineOS os);

deployment/envgen/CMakeLists.txt

@@ -48,7 +48,11 @@ target_link_libraries ( envgen
         deployutils 
         jlib 
         environment 
-        securesocket      
         )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( envgen 
+    	securesocket
+    )
+ENDIF()
 

ecl/hthor/CMakeLists.txt

@@ -85,9 +85,13 @@ target_link_libraries ( hthor
          deftype
          workunit
          jhtree
-         securesocket
          thorhelper
          roxiemem
          schedulectrl
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( hthor
+    	securesocket
+    )
+ENDIF()

esp/clients/WUManager/CMakeLists.txt

@@ -54,7 +54,11 @@ target_link_libraries ( wumanager
          jlib
          xmllib 
          esphttp
-         securesocket
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( wumanager
+    	securesocket
+    )
+ENDIF()
 

esp/services/WsDeploy/CMakeLists.txt

@@ -75,10 +75,13 @@ target_link_libraries ( WsDeploy
          dllserver 
          eclrtl 
          hql 
-         securesocket 
          deploy
          deployutils
          configutils
     )
 
-
+IF (USE_OPENSSL)
+    target_link_libraries ( WsDeploy
+    	securesocket
+    )
+ENDIF()

esp/services/ecldirect/CMakeLists.txt

@@ -75,8 +75,13 @@ target_link_libraries ( EclDirect
          jhtree 
          hql 
          fileview2 
-         securesocket 
     )
+
+IF (USE_OPENSSL)
+    target_link_libraries ( EclDirect
+    	securesocket
+    )
+ENDIF()
 IF (USE_OPENLDAP)
   target_link_libraries ( EclDirect LdapSecurity )
 ENDIF(USE_OPENLDAP)

esp/services/esdl_svc_engine/CMakeLists.txt

@@ -72,6 +72,11 @@ target_link_libraries ( esdl_svc_engine
          hql
          remote
          dalibase
-         securesocket
          esdllib
     )
+
+IF (USE_OPENSSL)
+    target_link_libraries ( esdl_svc_engine
+    	securesocket
+    )
+ENDIF()

esp/services/ws_access/CMakeLists.txt

@@ -63,6 +63,10 @@ target_link_libraries ( ws_access
          xmllib 
          esphttp 
          LdapSecurity 
-         securesocket 
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_access
+    	securesocket
+    )
+ENDIF()

esp/services/ws_account/CMakeLists.txt

@@ -60,8 +60,12 @@ target_link_libraries ( ws_account
          jlib
          xmllib 
          esphttp 
-         securesocket 
     )
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_account
+    	securesocket
+    )
+ENDIF()
 IF (USE_OPENLDAP)
 target_link_libraries ( ws_account LdapSecurity )
 ENDIF(USE_OPENLDAP)

esp/services/ws_dfu/CMakeLists.txt

@@ -96,8 +96,11 @@ target_link_libraries ( ws_dfu
          SMCLib 
          dfuXRefLib 
          dfuwu 
-         securesocket 
          roxiecommlib 
     )
 
-
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_dfu
+    	securesocket
+    )
+ENDIF()

esp/services/ws_ecl/CMakeLists.txt

@@ -77,7 +77,11 @@ target_link_libraries ( ws_ecl
          jhtree 
          hql 
          fileview2 
-         securesocket 
          xmllib 
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_ecl
+    	securesocket
+    )
+ENDIF()

esp/services/ws_machine/CMakeLists.txt

@@ -71,10 +71,15 @@ target_link_libraries ( ws_machine
          remote 
          dalibase 
          environment 
-         securesocket 
          workunit
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_machine
+    	securesocket
+    )
+ENDIF()
+
 FOREACH ( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/DhcpMethods.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/StartStop.xslt

esp/services/ws_packageprocess/CMakeLists.txt

@@ -53,8 +53,12 @@ target_link_libraries ( ws_packageprocess
          jlib
          xmllib
          esphttp
-         securesocket
          dalibase
          ws_fs
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_packageprocess
+    	securesocket
+    )
+ENDIF()

esp/services/ws_smc/CMakeLists.txt

@@ -77,7 +77,6 @@ target_link_libraries ( ws_smc
          remote 
          dalibase 
          environment 
-         securesocket 
          ws_machine 
          dalift 
          dllserver 
@@ -98,6 +97,11 @@ target_link_libraries ( ws_smc
          schedulectrl 
          ws_workunits 
     )
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_smc
+    	securesocket
+    )
+ENDIF()
 IF (USE_OPENLDAP)
 target_link_libraries ( ws_smc LdapSecurity )
 ENDIF(USE_OPENLDAP)

esp/services/ws_topology/CMakeLists.txt

@@ -76,9 +76,14 @@ target_link_libraries ( ws_topology
          deftype 
          workunit 
          SMCLib 
-         securesocket 
          swapnodelib
          )
+
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_topology
+    	securesocket
+    )
+ENDIF()
          
 IF (USE_ZLIB)
   target_link_libraries ( ws_topology

esp/services/ws_workunits/CMakeLists.txt

@@ -106,9 +106,13 @@ target_link_libraries ( ws_workunits
          hql
          jhtree
          fileview2
-         securesocket
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_workunits
+    	securesocket
+    )
+ENDIF()
 IF (USE_ZLIB)
   target_link_libraries ( ws_workunits
       ${ZLIB_LIBRARIES}

esp/test/httptest/CMakeLists.txt

@@ -44,7 +44,11 @@ HPCC_ADD_EXECUTABLE ( httptest ${SRCS} )
 
 target_link_libraries ( httptest 
          jlib
-         securesocket 
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( httptest
+    	securesocket
+    )
+ENDIF()
 

esp/test/httptest/httptest.cpp

@@ -152,10 +152,14 @@ HttpClient::HttpClient(int threads, int times, const char* host, int port, FILE*
     m_use_ssl = use_ssl;
     if(use_ssl)
     {
+#ifdef USE_OPENSSL
         if(sslconfig != NULL)
             m_ssctx.setown(createSecureSocketContextEx2(sslconfig, ClientSocket));
         else
             m_ssctx.setown(createSecureSocketContext(ClientSocket));
+#else
+        throw MakeStringException(-1, "HttpClient: failure to create SSL connection to host '%s': OpenSSL not enabled in build", host);
+#endif
     }
 }
 
@@ -183,8 +187,12 @@ int HttpClient::getUrl(const char* url)
 
     if(m_use_ssl)
     {
+#if USE_OPENSSL
         if(m_ssctx.get() == NULL)
             m_ssctx.setown(createSecureSocketContext(ClientSocket));
+#else
+        throw MakeStringException(-1, "HttpClient: failure to create SSL socket - OpenSSL not enabled in build");
+#endif
     }
 
     StringBuffer request;
@@ -276,8 +284,12 @@ int HttpClient::sendSoapRequest(const char* url, const char* soapaction, const c
 
     if(m_use_ssl)
     {
+#ifdef USE_OPENSSL
         if(m_ssctx.get() == NULL)
             m_ssctx.setown(createSecureSocketContext(ClientSocket));
+#else
+        throw MakeStringException(-1, "HttpClient: failure to create SSL socket - OpenSSL not enabled in build");
+#endif
     }
 
     StringBuffer request;
@@ -602,10 +614,14 @@ HttpServer::HttpServer(int port, const char* in, FILE* ofile, bool use_ssl, IPro
     m_recvDelay = m_sendDelay = m_closeDelay = 0;
     if(use_ssl)
     {
+#ifdef USE_OPENSSL
         if(sslconfig != NULL)
             m_ssctx.setown(createSecureSocketContextEx2(sslconfig, ServerSocket));
         else
             m_ssctx.setown(createSecureSocketContext(ServerSocket));
+#else
+        throw MakeStringException(-1, "HttpServer: failure to create SSL socket - OpenSSL not enabled in build");
+#endif
     }
 }
 
@@ -1168,10 +1184,14 @@ HttpProxy::HttpProxy(int localport, const char* host, int port, FILE* ofile, boo
     m_use_ssl = use_ssl;
     if(use_ssl)
     {
+#if USE_OPENSSL
         if(sslconfig != NULL)
             m_ssctx.setown(createSecureSocketContextEx2(sslconfig, ClientSocket));
         else
             m_ssctx.setown(createSecureSocketContext(ClientSocket));
+#else
+        throw MakeStringException(-1, "HttpProxy: failure to create SSL connection to host '%s': OpenSSL not enabled in build", host);
+#endif
     }
 }
 

esp/tools/soapplus/CMakeLists.txt

@@ -50,8 +50,12 @@ install ( TARGETS soapplus RUNTIME DESTINATION ${EXEC_DIR} COMPONENT Runtime)
 target_link_libraries ( soapplus 
          jlib
          xmllib 
+    )
+IF (USE_OPENSSL)
+    target_link_libraries ( soapplus 
          securesocket 
     )
+ENDIF()
 
 FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/EspMethods.txt

esp/tools/soapplus/http.cpp

@@ -459,8 +459,12 @@ HttpClient::HttpClient(IProperties* globals, const char* url, const char* inname
 
         if(stricmp(m_protocol.str(), "HTTPS") == 0)
         {
+#ifdef USE_OPENSSL
             if(m_ssctx.get() == NULL)
                 m_ssctx.setown(createSecureSocketContext(ClientSocket));
+#else
+        throw MakeStringException(-1, "HttpClient: failure to create SSL socket - OpenSSL not enabled in build");
+#endif
         }
 
         if(m_user.length() > 0)

esp/tools/soapplus/httpproxy.cpp

@@ -197,12 +197,16 @@ int COneServerHttpProxyThread::start()
         socket2.setown(ISocket::connect(ep));
         if(m_use_ssl && m_ssctx != NULL)
         {
+#ifdef USE_OPENSSL
             Owned<ISecureSocket> securesocket = m_ssctx->createSecureSocket(socket2.getLink());
             int res = securesocket->secure_connect();
             if(res >= 0)
             {
                 socket2.set(securesocket.get());
             }
+#else
+        throw MakeStringException(-1, "COneServerHttpProxyThread: failure to create SSL socket - OpenSSL not enabled in build");
+#endif
         }
 
         if(socket2.get() == NULL)
@@ -558,7 +562,11 @@ HttpProxy::HttpProxy(int localport, const char* url, FILE* ofile, const char* ur
 
         if(m_use_ssl)
         {
+#ifdef USE_OPENSSL
             m_ssctx.setown(createSecureSocketContext(ClientSocket));
+#else
+        throw MakeStringException(-1, "HttpProxy: failure to create SSL socket - OpenSSL not enabled in build");
+#endif
         }       
     }
     
@@ -574,10 +582,14 @@ HttpProxy::HttpProxy(int localport, const char* host, int port, FILE* ofile, boo
     m_use_ssl = use_ssl;
     if(use_ssl)
     {
+#ifdef USE_OPENSSL
         if(sslconfig != NULL)
             m_ssctx.setown(createSecureSocketContextEx2(sslconfig, ClientSocket));
         else
             m_ssctx.setown(createSecureSocketContext(ClientSocket));
+#else
+        throw MakeStringException(-1, "HttpProxy: failure to create SSL socket - OpenSSL not enabled in build");
+#endif
     }       
 }
 

roxie/ccd/CMakeLists.txt

@@ -103,7 +103,6 @@ target_link_libraries ( ccd
          eclrtl 
          dalibase 
          deftype 
-         securesocket 
          thorhelper 
          jhtree 
          environment 
@@ -112,5 +111,10 @@ target_link_libraries ( ccd
          workunit 
     )
 
+IF (USE_OPENSSL)
+    target_link_libraries ( ccd
+    	securesocket
+    )
+ENDIF()
 
 

system/security/CMakeLists.txt

@@ -16,7 +16,9 @@
 IF (USE_OPENLDAP)
 HPCC_ADD_SUBDIRECTORY (LdapSecurity)
 ENDIF(USE_OPENLDAP)
-HPCC_ADD_SUBDIRECTORY (securesocket)
+IF (USE_OPENSSL)
+  HPCC_ADD_SUBDIRECTORY (securesocket)
+ENDIF()
 HPCC_ADD_SUBDIRECTORY (test "PLATFORM")
 if (USE_ZLIB)
   HPCC_ADD_SUBDIRECTORY (zcrypt "PLATFORM")

system/security/test/CMakeLists.txt

@@ -16,4 +16,6 @@
 IF (USE_OPENLDAP)
 add_subdirectory (ldapsecuritytest)
 ENDIF(USE_OPENLDAP)
+IF (USE_OPENSSL)
 add_subdirectory (myssl)
+ENDIF(USE_OPENSSL)