.gitlab-ci.yml

@@ -55,3 +55,12 @@ build:amd64.macos:
     script:
       - mkdir build
       - cd build && $(${OSXCROSS_ROOT}/bin/osxcross-conf) && export OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 && export OSXCROSS_HOST=x86_64-apple-darwin20.4 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${OSXCROSS_ROOT}/toolchain.cmake -DBoost_INCLUDE_DIR=$BOOST_INCLUDE_DIR .. && make -j$(nproc)
+
+
+build:any.android:
+    extends: .tests
+    image: demlabs/android/any:qt5
+    before_script: /opt/buildtools/prepare_environment.sh amd64-osx
+    script:
+      - mkdir build
+      - cd build &&  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${ANDROID_CMAKE_TOOLCHAIN} .. && make -j$(nproc)

cmake/OS_Detection.cmake

@@ -102,8 +102,8 @@ if(UNIX)
         set(CCOPT_SYSTEM "")
         set(LDOPT_SYSTEM "")
         if(DAP_DEBUG)
-            set(_CCOPT "-DDAP_DEBUG ${CFLAGS_WARNINGS} -pg -g3 -ggdb -fno-eliminate-unused-debug-symbols -fno-strict-aliasing -std=gnu1x")
-            set(_LOPT "-pg")
+            set(_CCOPT "-DDAP_DEBUG ${CFLAGS_WARNINGS} -g3 -ggdb -fno-eliminate-unused-debug-symbols -fno-strict-aliasing -std=gnu1x")
+            
             if (DEFINED ENV{DAP_ASAN})
                 message("[!] Address Sanitizer enabled")
                 set(_CCOPT "${_CCOPT} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer -fno-common -O1")
@@ -125,7 +125,6 @@ if(UNIX)
                 set(_CCOPT "${_CCOPT} -fsanitize=undefined -fsanitize=bounds -fno-omit-frame-pointer")
                 set(_LOPT "${_LOPT} -fsanitize=undefined")
             endif()
-            SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg")
         else()
             set(_CCOPT "${CFLAGS_WARNINGS} -fno-ident -ffast-math -ftree-vectorize -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -std=gnu11")
             if (DEFINED ENV{DAP_ASAN})
@@ -172,9 +171,7 @@ if(UNIX)
         set(CCOPT_SYSTEM "-L/usr/local/lib -I/usr/local/include")
         set(LDOPT_SYSTEM "-L/usr/local/lib")
         if(DAP_DEBUG)
-          set(_CCOPT "${CCOPT_SYSTEM} -DDAP_DEBUG ${CFLAGS_WARNINGS} -pg -g3 -ggdb -fno-eliminate-unused-debug-symbols -fno-strict-aliasing")
-          set(_LOPT "-pg ${LDOPT_SYSTEM} ")
-	  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg")
+          set(_CCOPT "${CCOPT_SYSTEM} -DDAP_DEBUG ${CFLAGS_WARNINGS} -g3 -ggdb -fno-eliminate-unused-debug-symbols -fno-strict-aliasing")
         else()
           set(_CCOPT "${CCOPT_SYSTEM} ${CFLAGS_WARNINGS} -O3 -fPIC -fno-strict-aliasing -fno-ident -ffast-math -ftree-vectorize -fno-asynchronous-unwind-tables -ffunction-sections -std=gnu11")
           set(_LOPT "${LDOPT_SYSTEM} ")

core/src/unix/linux/dap_network_monitor.c

@@ -153,7 +153,7 @@ static void _route_msg_handler(struct nlmsghdr *nlh,
 
     route_attribute_len = RTM_PAYLOAD(nlh);
 
-    for ( ; NLMSG_OK(nlh, received_bytes); \
+    for ( ; NLMSG_OK(nlh, (size_t)received_bytes); \
                        nlh = NLMSG_NEXT(nlh, received_bytes))
        {
            /* Get the route data */
@@ -246,7 +246,7 @@ static void* network_monitor_worker(void *arg)
     while ((len = recvmsg(_net_notification.socket, &msg, 0)) > 0){
         _send_NLM_F_ACK_msg(_net_notification.socket);
 
-        for (nlh = (struct nlmsghdr *) buf; (NLMSG_OK(nlh, len)) && (nlh->nlmsg_type != NLMSG_DONE); nlh = NLMSG_NEXT(nlh, len)) {
+        for (nlh = (struct nlmsghdr *) buf; (NLMSG_OK(nlh, (size_t)len)) && (nlh->nlmsg_type != NLMSG_DONE); nlh = NLMSG_NEXT(nlh, len)) {
             if (nlh->nlmsg_type == NLMSG_ERROR){
                 /* Do some error handling. */
                 log_it(L_DEBUG, "There an error! nlmsg_type %d", nlh->nlmsg_type);

crypto/XKCP/CMakeLists.txt

@@ -65,6 +65,7 @@ message("[*] XKCP target: ${TARGET_ARCH} ${XKCP_TARGET}")
 message("[*] XKCP build dir: ${XKCP_BUILD_DIR}")
 message("[*] XKCP make command: ${MAKE}")
 message("[*] XKCP make CC: ${CMAKE_C_COMPILER}")
+message("[*] XKCP make COMPILER_TARGET: ${CMAKE_C_COMPILER_TARGET}")
 message("[*] XKCP make AR: ${CMAKE_AR}")
 message("[*] XKCP compiller supports -march=native: ${COMPILER_SUPPORTS_MARCH_NATIVE}")
 message("[*] XKCP SYSROOT: ${CMAKE_OSX_SYSROOT}")
@@ -74,8 +75,16 @@ SET(XKCP_BUILD_LIB ${XKCP_BUILD_DIR}/bin/${XKCP_TARGET})
 
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${XKCP_BUILD_DIR})
 
+if (CMAKE_C_COMPILER_TARGET)
+    set(MAKE_C_FLAGS "--target=${CMAKE_C_COMPILER_TARGET} ${CMAKE_C_FLAGS} ")
+else()
+    set(MAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+endif()
+
+message("[*] XKCP CFLAGS: ${MAKE_C_FLAGS}")
+
 add_custom_target(BuildXKCP ALL
-    COMMAND ${CMAKE_COMMAND}  -E env AR=${CMAKE_AR} CC=${CMAKE_C_COMPILER} SDKROOT=${CMAKE_OSX_SYSROOT}  ${MAKE} -C ./xkcp_build_src ${XKCP_TARGET}
+    COMMAND ${CMAKE_COMMAND}  -E env AR=${CMAKE_AR} CC=${CMAKE_C_COMPILER} CFLAGS=${MAKE_C_FLAGS} SDKROOT=${CMAKE_OSX_SYSROOT}  ${MAKE} -C ./xkcp_build_src ${XKCP_TARGET}
     BYPRODUCTS ${XKCP_BUILD_LIB}
 )
 

crypto/XKCP/libdap-xkcp-armv7.build

 <?xml version="1.0"?>
 <group>
-	<target name="libdap-XKCP-armv7.a" inherits="FIPS202 K1600-ARMv7A-NEON"/>
-	<target name="libdap-XKCP-armv7-native.a" inherits="FIPS202 K1600-ARMv7A-NEON optimized-march-native"/>
+	<target name="libdap-XKCP-armv7.a" inherits="FIPS202  K1600-plain-64bits-lcua"/>
+	<target name="libdap-XKCP-armv7-native.a" inherits="FIPS202 K1600-plain-64bits-lcua optimized-march-native"/>
 </group>
\ No newline at end of file

crypto/XKCP/libdap-xkcp-armv8.build

 <?xml version="1.0"?>
 <group>
 	<target name="libdap-XKCP-armv8.a" inherits="FIPS202 K1600-plain-64bits-lcua"/>
-	<target name="libdap-XKCP-armv8-native.a" inherits="FIPS202 K1600-plain-64bits-lcua optimized-march-native"/>
+	<target name="libdap-XKCP-armv8-native.a" inherits="FIPS202 K1600-plain-64bits-lcua"/>
 </group>
\ No newline at end of file