Remove obsolete code

.github/workflows/ci.yml

@@ -55,7 +55,6 @@ jobs:
       DARGS: >-
         -eCCACHE_DIR
         -eTEST_CC=clang
-        -eTEST_WITH_LOAD_TESTS=1
         -eTEST_WITH_TESTSUITE=0
         -eTEST_WITH_STATICTESTS=1
         -eTEST_WITH_DOCS=1

.gitmodules

@@ -1,12 +1,6 @@
 [submodule "tests/tuf-test-vectors"]
 	path = tests/tuf-test-vectors
 	url = https://github.com/advancedtelematic/tuf-test-vectors/
-[submodule "third_party/isotp-c"]
-	path = third_party/isotp-c
-	url = https://github.com/advancedtelematic/isotp-c.git
-[submodule "third_party/HdrHistogram_c"]
-	path = third_party/HdrHistogram_c
-	url = https://github.com/HdrHistogram/HdrHistogram_c
 [submodule "third_party/googletest"]
 	path = third_party/googletest
 	url = https://github.com/google/googletest.git

.ort.yml

@@ -6,9 +6,6 @@ excludes:
   - pattern: "third_party/googletest/**"
     reason: "TEST_TOOL_OF"
     comment: "This directory contains support code for tests which are not distributed."
-  - pattern: "third_party/HdrHistogram_c/**"
-    reason: "TEST_TOOL_OF"
-    comment: "This directory contains support code for tests which are not distributed."
   - pattern: "third_party/junit/ctest2junit.xsl"
     reason: "TEST_TOOL_OF"
     comment: "This file contains support code for tests which are not distributed."

CMakeLists.txt

@@ -26,8 +26,6 @@ option(BUILD_DEB "Set to ON to compile with debian packages support" OFF)
 option(BUILD_DOCKERAPP "Set to ON to compile with package manager support of docker-app" OFF)
 option(BUILD_P11 "Support for key storage in a HSM via PKCS#11" OFF)
 option(BUILD_SOTA_TOOLS "Set to ON to build SOTA tools" OFF)
-option(BUILD_ISOTP "Set to ON to compile with ISO/TP protocol support" OFF)
-option(BUILD_LOAD_TESTS "Set to ON to build load tests" OFF)
 option(FAULT_INJECTION "Set to ON to enable fault injection" OFF)
 option(INSTALL_LIB "Set to ON to install library and headers" OFF)
 option(TESTSUITE_VALGRIND "Set to ON to make tests to run under valgrind (default when CMAKE_BUILD_TYPE=Valgrind)" ${TESTSUITE_VALGRIND_DEFAULT})
@@ -67,17 +65,7 @@ set(BOOST_COMPONENTS log_setup log system filesystem program_options)
 set(Boost_USE_STATIC_LIBS OFF)
 add_definitions(-DBOOST_LOG_DYN_LINK)
 
-if(ANDROID)
-    set(BOOST_ROOT ${PREBUILD_BOOST_ROOT})
-    set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include)
-    set(Boost_LIBRARY_DIR ${BOOST_ROOT}/libs/llvm/${ANDROID_ABI})
-    if(Boost_FOUND)
-        include_directories(${Boost_INCLUDE_DIRS})
-    endif()
-endif(ANDROID)
-
 # Mac brew library install paths
-
 if(EXISTS /usr/local/opt/openssl)
   list(APPEND CMAKE_PREFIX_PATH /usr/local/opt/openssl)
 endif()
@@ -189,12 +177,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
         add_definitions(-Wshadow)
     endif ()
 
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_SYSTEM_NAME MATCHES "Android")
-        # treat boost headers as system to ignore warnings,
-        # this is alternative to in-code diagnostics disabling
-        add_definitions(--system-header-prefix=boost/)
-    endif ()
-
     if (WARNING_AS_ERROR)
         add_definitions(-Werror)
     endif ()
@@ -371,10 +353,6 @@ set (AKTUALIZR_EXTERNAL_LIBS
     ${LIBP11_LIBRARIES}
     ${GLIB2_LIBRARIES})
 
-if(ANDROID)
-    list(APPEND AKTUALIZR_EXTERNAL_LIBS liblog.so)
-endif()
-
 get_directory_property(hasParent PARENT_DIRECTORY)
 if(hasParent)
     set (AKTUALIZR_EXTERNAL_LIBS ${AKTUALIZR_EXTERNAL_LIBS} PARENT_SCOPE)
@@ -403,17 +381,8 @@ add_library(jsoncpp OBJECT ${PROJECT_BINARY_DIR}/jsoncpp/jsoncpp.cc)
 
 add_subdirectory("fuzz")
 add_subdirectory("config")
-if (BUILD_LOAD_TESTS)
-    # HdrHistogram installs support libraries, which creates junk the aktualizr
-    # recipe would have to remove
-    # Temporarily remove flag not supported by isotp-c and bitfield.
-    remove_definitions(-Wconversion)
-    add_subdirectory("third_party/HdrHistogram_c/src")
-    add_definitions(-Wconversion)
-endif(BUILD_LOAD_TESTS)
 add_subdirectory("src")
 add_subdirectory("tests" EXCLUDE_FROM_ALL)
-
 add_subdirectory("docs/doxygen")
 
 # Check if some source files were not added sent to `aktualizr_source_file_checks`
@@ -423,11 +392,6 @@ add_subdirectory("docs/doxygen")
 file(GLOB_RECURSE ALL_SOURCE_FILES RELATIVE ${CMAKE_SOURCE_DIR}
     src/*.cc src/*.c src/*.h)
 foreach(FILE ${ALL_SOURCE_FILES})
-    string (FIND ${FILE} "/libaktualizr-isotp/" EXCLUDE_DIR_FOUND)
-    if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
-        continue()
-    endif()
-
     list(FIND AKTUALIZR_CHECKED_SRCS ${FILE} INDEX)
     if (${INDEX} EQUAL "-1")
         message(FATAL_ERROR "${FILE} not checked")

ci/gitlab/.gitlab-ci.yml

@@ -134,7 +134,6 @@ focal-build-static:
     TEST_CMAKE_BUILD_TYPE: 'Debug'
     TEST_TESTSUITE_ONLY: 'crypto'
     TEST_WITH_STATICTESTS: '1'
-    TEST_WITH_LOAD_TESTS: '1'
     TEST_WITH_DOCS: '1'
   image: "$UBUNTU_FOCAL_PR_IMAGE"
   stage: test
@@ -354,7 +353,6 @@ veracode-pkg:
     TEST_WITH_SOTA_TOOLS: '0'
     TEST_WITH_OSTREE: '0'
     TEST_WITH_DEB: '0'
-    TEST_WITH_ISOTP: '0'
   image: "$UBUNTU_BIONIC_PR_IMAGE"
   script:
     - ./scripts/test.sh

docs/doxygen/Doxyfile.in

@@ -830,7 +830,6 @@ INPUT                  = @CMAKE_SOURCE_DIR@/docs \
                          @CMAKE_SOURCE_DIR@/src/libaktualizr/telemetry \
                          @CMAKE_SOURCE_DIR@/src/libaktualizr/uptane \
                          @CMAKE_SOURCE_DIR@/src/libaktualizr/utilities \
-                         @CMAKE_SOURCE_DIR@/src/libaktualizr-isotp \
                          @CMAKE_SOURCE_DIR@/src/sota_tools \
                          @CMAKE_SOURCE_DIR@/src/uptane_generator \
                          @CMAKE_SOURCE_DIR@/src/virtual_secondary \

include/libaktualizr/config.h

@@ -81,7 +81,6 @@ struct UptaneConfig {
 #define PACKAGE_MANAGER_NONE "none"
 #define PACKAGE_MANAGER_OSTREE "ostree"
 #define PACKAGE_MANAGER_DEBIAN "debian"
-#define PACKAGE_MANAGER_ANDROID "android"
 #define PACKAGE_MANAGER_OSTREEDOCKERAPP "ostree+docker-app"
 
 #ifdef BUILD_OSTREE

include/libaktualizr/types.h

@@ -96,7 +96,7 @@ inline std::istream &operator>>(std::istream &is, KeyType &kt) {
   return is;
 }
 
-enum class CryptoSource { kFile = 0, kPkcs11, kAndroid };
+enum class CryptoSource { kFile = 0, kPkcs11 };
 
 inline std::ostream &operator<<(std::ostream &os, CryptoSource cs) {
   std::string cs_str;

scripts/test.sh

@@ -18,9 +18,7 @@ TEST_WITH_P11=${TEST_WITH_P11:-0}
 TEST_WITH_OSTREE=${TEST_WITH_OSTREE:-1}
 TEST_WITH_DEB=${TEST_WITH_DEB:-1}
 TEST_WITH_DOCKERAPP=${TEST_WITH_DOCKERAPP:-0}
-TEST_WITH_ISOTP=${TEST_WITH_ISOTP:-1}
 TEST_WITH_FAULT_INJECTION=${TEST_WITH_FAULT_INJECTION:-0}
-TEST_WITH_LOAD_TESTS=${TEST_WITH_LOAD_TESTS:-0}
 
 TEST_CC=${TEST_CC:-gcc}
 TEST_CMAKE_GENERATOR=${TEST_CMAKE_GENERATOR:-Ninja}
@@ -50,9 +48,7 @@ fi
 if [[ $TEST_WITH_OSTREE = 1 ]]; then CMAKE_ARGS+=("-DBUILD_OSTREE=ON"); fi
 if [[ $TEST_WITH_DEB = 1 ]]; then CMAKE_ARGS+=("-DBUILD_DEB=ON"); fi
 if [[ $TEST_WITH_DOCKERAPP = 1 ]]; then CMAKE_ARGS+=("-DBUILD_DOCKERAPP=ON"); fi
-if [[ $TEST_WITH_ISOTP = 1 ]]; then CMAKE_ARGS+=("-DBUILD_ISOTP=ON"); fi
 if [[ $TEST_WITH_FAULT_INJECTION = 1 ]]; then CMAKE_ARGS+=("-DFAULT_INJECTION=ON"); fi
-if [[ $TEST_WITH_LOAD_TESTS = 1 ]]; then CMAKE_ARGS+=("-DBUILD_LOAD_TESTS=ON"); fi
 if [[ -n $TEST_SOTA_PACKED_CREDENTIALS ]]; then
     CMAKE_ARGS+=("-DSOTA_PACKED_CREDENTIALS=$TEST_SOTA_PACKED_CREDENTIALS");
 fi

src/CMakeLists.txt

@@ -8,7 +8,6 @@ add_subdirectory("virtual_secondary")
 add_subdirectory("sota_tools")
 add_subdirectory("aktualizr_primary")
 add_subdirectory("libaktualizr-posix")
-add_subdirectory("libaktualizr-isotp")
 add_subdirectory("aktualizr_secondary")
 add_subdirectory("aktualizr_info")
 add_subdirectory("uptane_generator")