Addition of ssl lib for SSL/TLS. Ref #51 (#53)

Author: sshanks-kx

CMakeLists.txt

@@ -8,6 +8,7 @@ project(mqttkdb C)
 
 # Name of shared object
 set(MY_LIBRARY_NAME mqttkdb)
+set(MY_SSL_LIBRARY_NAME mqttkdb_ssl)
 
 # Dispay settings
 message(STATUS "Generator : ${CMAKE_GENERATOR}")
@@ -31,12 +32,20 @@ add_library(${MY_LIBRARY_NAME} SHARED
     src/mqtt.c
     src/socketpair.c
 )
+add_library(${MY_SSL_LIBRARY_NAME} SHARED
+    src/mqtt.c
+    src/socketpair.c
+)
 
 # Specify include directories
 target_include_directories (${MY_LIBRARY_NAME} PRIVATE
     ${PROJECT_SOURCE_DIR}/include
     $ENV{MQTT_INSTALL_DIR}/include
 )
+target_include_directories (${MY_SSL_LIBRARY_NAME} PRIVATE
+    ${PROJECT_SOURCE_DIR}/include
+    $ENV{MQTT_INSTALL_DIR}/include
+)
 
 # Basic compile flag
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -DKXVER=3")
@@ -50,6 +59,10 @@ find_library(MQTT3C_LIBRARY
     NAMES paho-mqtt3c
     HINTS "$ENV{MQTT_INSTALL_DIR}/lib/"
 )
+find_library(MQTT3CS_LIBRARY
+    NAMES paho-mqtt3cs
+    HINTS "$ENV{MQTT_INSTALL_DIR}/lib/"
+)
 
 if (MSVC)
     # Get q dependency
@@ -72,14 +85,19 @@ if(APPLE)
 endif()
 set_target_properties(${MY_LIBRARY_NAME} PROPERTIES PREFIX "")
 set_target_properties(${MY_LIBRARY_NAME} PROPERTIES SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+set_target_properties(${MY_SSL_LIBRARY_NAME} PROPERTIES PREFIX "")
+set_target_properties(${MY_SSL_LIBRARY_NAME} PROPERTIES SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+target_compile_definitions(${MY_SSL_LIBRARY_NAME} PRIVATE -DMQTT_SSL)
 
 # Link flag
 IF(APPLE)
    set_target_properties(${MY_LIBRARY_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+   set_target_properties(${MY_SSL_LIBRARY_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
 endif()
 
 # Link dependent libraries
 target_link_libraries(${MY_LIBRARY_NAME} ${MQTT3C_LIBRARY} ${Q_LIBRARY})
+target_link_libraries(${MY_SSL_LIBRARY_NAME} ${MQTT3CS_LIBRARY} ${Q_LIBRARY})
 
 ##%% Installation %%##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv#
 
@@ -116,7 +134,15 @@ add_custom_command(TARGET ${MY_LIBRARY_NAME}
     COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${MY_LIBRARY_NAME}>" ${PROJECT_BINARY_DIR}/${CMAKE_PROJECT_NAME}/lib/${MY_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
     DEPENDS ${MY_LIBRARY_NAME}
 )
+add_custom_command(TARGET ${MY_SSL_LIBRARY_NAME}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${MY_SSL_LIBRARY_NAME}>" ${PROJECT_BINARY_DIR}/${CMAKE_PROJECT_NAME}/lib/${MY_SSL_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+    DEPENDS ${MY_SSL_LIBRARY_NAME}
+)
+
+
 
 # Install at Release
 install(TARGETS ${MY_LIBRARY_NAME} DESTINATION "$ENV{QHOME}/${OSFLAG}${BITNESS}/" CONFIGURATIONS Release)
+install(TARGETS ${MY_SSL_LIBRARY_NAME} DESTINATION "$ENV{QHOME}/${OSFLAG}${BITNESS}/" CONFIGURATIONS Release)
 install(DIRECTORY "q/" DESTINATION "$ENV{QHOME}" CONFIGURATIONS Release)

README.md

@@ -44,7 +44,7 @@ MQTT is used commonly for constrained devices with low-bandwidth, high-latency o
         $ export DYLD_LIBRARY_PATH=/Users/jim/Eclipse-Paho-MQTT-C/lib/:$DYLD_LIBRARY_PATH
       
         ```
-   - Windows: Add the `paho-mqtt3c.dll` to the kdb+ lib directory e.g. `C:\q\w64` for 64-bit.
+   - Windows: Add the `paho-mqtt3c.dll` and `paho-mqtt3cs.dll` to the kdb+ lib directory e.g. `C:\q\w64` for 64-bit.
 3. Download the latest release of the mqtt interface from our [releases page](https://github.com/KxSystems/mqtt). To install shared library and q files, use:
 
         # Linux/MacOS
@@ -65,7 +65,7 @@ MQTT is used commonly for constrained devices with low-bandwidth, high-latency o
      ```bash
 
      ]$ mkdir paho_mqtt_c
-     ]$ tar xzf Eclipse-Paho-MQTT-C-1.3.8-Linux.tar.gz -C paho_mqtt_c/ --strip-components=1
+     ]$ tar xzf Eclipse-Paho-MQTT-C-1.3.11-Linux.tar.gz -C paho_mqtt_c/ --strip-components=1
      ]$ cd paho_mqtt_c/
      paho_mqtt_c]$ export MQTT_INSTALL_DIR=$(pwd)
 
@@ -102,11 +102,12 @@ MQTT is used commonly for constrained devices with low-bandwidth, high-latency o
      ```bat
 
      > mkdir paho_mqtt_c
-     > 7z x eclipse-paho-mqtt-c-win64-1.3.8.zip -opaho_mqtt_c
+     > 7z x eclipse-paho-mqtt-c-win64-1.3.11.zip -opaho_mqtt_c
      > cd paho_mqtt_c
      paho_mqtt_c> set MQTT_INSTALL_DIR=%cd%
      paho_mqtt_c> cd %QHOME%\w64
      w64> MKLINK paho-mqtt3c.dll %MQTT_INSTALL_DIR%\lib\paho-mqtt3c.dll
+     w64> MKLINK paho-mqtt3cs.dll %MQTT_INSTALL_DIR%\lib\paho-mqtt3cs.dll
 
      ```
 

docker_linux/Dockerfile.alpine

@@ -45,7 +45,7 @@ RUN apk add --update && \
     apk del make && \
     apk del wget && \
 	apk del build-base && \	
-    rm -rf /source/mqtt_build.sh /source/paho.mqtt.c /source/v1.3.9* /source/mqtt/CmakeLists.txt 
+    rm -rf /source/mqtt_build.sh /source/paho.mqtt.c /source/v1.3.11* /source/mqtt/CmakeLists.txt
 
 ## Update this section here to add kdb+
 #COPY q/k4.lic /q/
@@ -57,4 +57,4 @@ RUN apk add --update && \
 
 WORKDIR /source
 
-ENTRYPOINT ["/bin/sh"]
+ENTRYPOINT ["/bin/sh"]

docker_linux/build_libpaho.sh

@@ -2,8 +2,8 @@
 
 cd /source
 
-wget https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v1.3.9.tar.gz
-tar xvf v1.3.9.tar.gz -C ./paho.mqtt.c --strip-components=1
+wget https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v1.3.11.tar.gz
+tar xvf v1.3.11.tar.gz -C ./paho.mqtt.c --strip-components=1
 
 cd paho.mqtt.c
 
@@ -25,4 +25,4 @@ mkdir /source/mqtt/cmake
 cd  /source/mqtt/cmake
 cmake ..
 make
-make install
+make install

src/mqtt.c

@@ -2,7 +2,11 @@
 #include <winsock2.h>
 #include <windows.h>
 #pragma comment(lib,"ws2_32.lib")
+#ifdef MQTT_SSL
+#pragma comment(lib,"paho-mqtt3cs.lib")
+#else
 #pragma comment(lib,"paho-mqtt3c.lib")
+#endif
 #pragma comment(lib,"q.lib")
 #define EXP __declspec(dllexport)
 static SOCKET spair[2];