merged develop into KAA-1146

client/client-multi/client-c/CMakeLists.txt

@@ -54,9 +54,9 @@
 #
 #	- `cc32xx`
 #	- `esp8266`
-#	- `x86-64`
+#	- `posix`
 #
-#	Default: `x86-64`
+#	Default: `posix`
 #
 #	- `KAA_UNITETESTS_COMPILE` - compile unit tests.
 #
@@ -73,12 +73,15 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(Kaa-c C)
 
+include(ExternalProject)
+
 option(WITH_EXTENSION_PROFILE "Enable profile extension" ON)
 option(WITH_EXTENSION_CONFIGURATION "Enable configuration extension" ON)
 option(WITH_EXTENSION_EVENT "Enable event extension" ON)
 option(WITH_EXTENSION_LOGGING "Enable logging extension" ON)
 option(WITH_EXTENSION_NOTIFICATION "Enable notification extension" ON)
 option(WITH_EXTENSION_USER "Enable user extension" ON)
+option(WITH_ENCRYPTION "Enable encryption" ON)
 
 # Expose Kaa SDK directory to all modules
 set(KAA_SDK_DIR ${CMAKE_CURRENT_LIST_DIR})
@@ -94,7 +97,7 @@ set(CMAKE_MODULE_PATH
 #
 # NOTE: Platform specific compilation flags should be set
 # in the corresponding platform CMake script(s).
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic -D_GNU_SOURCE")
 
 set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os")
 
@@ -116,7 +119,7 @@ set(KAA_THIRDPARTY_LIBRARIES "")
 
 # Sets the default build platform to POSIX.
 if (NOT DEFINED KAA_PLATFORM)
-    set(KAA_PLATFORM "x86-64")
+    set(KAA_PLATFORM "posix")
 endif ()
 
 #
@@ -174,15 +177,34 @@ set(KAA_SOURCE_FILES
         ${KAA_SRC_FOLDER}/kaa.c
         ${KAA_SRC_FOLDER}/kaa_extension.c
         ${KAA_SRC_FOLDER}/platform-impl/common/kaa_htonll.c
-        )
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/aes.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/asn1parse.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/asn1write.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/bignum.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/ctr_drbg.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/entropy.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/entropy_poll.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/md.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/md_wrap.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/oid.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/pk.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/pkwrite.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/pk_wrap.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/rsa.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/sha256.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/pkparse.c
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls/sha1.c
+  )
+
 
 # Includes auto-generated Cmake's scripts.
 include(${CMAKE_CURRENT_LIST_DIR}/listfiles/CMakeGen.cmake)
 
 # Kaa include directories
 set(KAA_INCLUDE_DIRS
         ${KAA_INCLUDE_PATHS}         # Provided by platform cmake
-        ${CMAKE_CURRENT_SOURCE_DIR}/src
+        ${CMAKE_CURRENT_LIST_DIR}/src
+        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls
         ${KAA_SRC_FOLDER}
         ${KAA_THIRDPARTY_INCLUDE_DIR})
 
@@ -194,6 +216,8 @@ add_library(kaac ${KAA_SOURCE_FILES})
 target_include_directories(kaac PUBLIC ${KAA_INCLUDE_DIRS})
 target_link_libraries(kaac PRIVATE ${KAA_THIRDPARTY_LIBRARIES})
 
+add_dependencies(kaac kaa_rsa_keygen)
+
 message("BOOTSTRAP ENABLED")
 include(${CMAKE_CURRENT_LIST_DIR}/src/extensions/bootstrap/CMakeLists.txt)
 target_link_libraries(kaac PUBLIC extension_bootstrap)
@@ -252,7 +276,13 @@ else()
     add_definitions(-DKAA_DISABLE_FEATURE_NOTIFICATION)
 endif()
 
-message("KAA WILL BE INSTALLED TO  ${CMAKE_INSTALL_PREFIX} ")
+if(WITH_ENCRYPTION)
+    message("ENCRYPTION ENABLED")
+
+    add_definitions(-DKAA_ENCRYPTION)
+endif()
+
+message("KAA WILL BE INSTALLED TO  ${CMAKE_INSTALL_PREFIX}")
 install(DIRECTORY ${KAA_SRC_FOLDER}/ DESTINATION include/kaa
         FILES_MATCHING PATTERN *.h)
 
@@ -261,3 +291,11 @@ install(TARGETS kaac DESTINATION lib)
 add_subdirectory(Modules/doxygen)
 
 add_subdirectory(Modules/cppcheck)
+
+externalproject_add(kaa_rsa_keygen SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/tools/kaa_encryption"
+                    INSTALL_COMMAND  "./generate_rsa_keys" COMMENT "Generating RSA headers"
+                    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/kaa_keys)
+
+externalproject_add_step(kaa_rsa_keygen "Copying generated files"
+                         COMMAND mv -f "${CMAKE_CURRENT_BINARY_DIR}/kaa_keys/kaa_keys_gen.h"
+                         "${KAA_SRC_FOLDER}/gen" DEPENDEES install)

client/client-multi/client-c/Modules/cppcheck/CMakeLists.txt

@@ -23,10 +23,11 @@ if(CPPCHECK_COMMAND)
      COMMAND ${CPPCHECK_COMMAND} --quiet --enable=all --std=c99 --suppress=unusedFunction
                                  --force --error-exitcode=1 --template=gcc -I src/kaa
                                  --inline-suppr src/ test/
+                                 -ithirdparty/
      WORKING_DERICTORY ${KAA_SDK_DIR}
      COMMENT "Running cppcheck"
      VERBATIM
      )
 else()
   message (STATUS "Could NOT find cppcheck")
-endif()
+endif()

client/client-multi/client-c/assembly/client-c-sdk.xml

@@ -43,6 +43,10 @@
             <directory>${project.basedir}/Modules</directory>
             <outputDirectory>Modules</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/thirdparty</directory>
+            <outputDirectory>thirdparty</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>${project.basedir}/tools</directory>
             <outputDirectory>tools</outputDirectory>

client/client-multi/client-c/build.sh

@@ -34,7 +34,7 @@ fi
 prepare_build() {
     mkdir -p build-posix
     cd build-posix
-    cmake -DCMAKE_BUILD_TYPE=Debug -DKAA_MAX_LOG_LEVEL=$MAX_LOG_LEVEL -DKAA_UNITTESTS_COMPILE=1 -DKAA_COLLECT_COVERAGE=1 .. -DCMAKE_C_FLAGS="-Werror"
+    cmake -DCMAKE_BUILD_TYPE=Debug -DKAA_MAX_LOG_LEVEL=$MAX_LOG_LEVEL -DKAA_UNITTESTS_COMPILE=1 -DKAA_COLLECT_COVERAGE=1 -DKAA_ENCRYPTION=1 .. -DCMAKE_C_FLAGS="-Werror"
     cd ..
 }
 

client/client-multi/client-c/listfiles/UnitTest.cmake

@@ -214,9 +214,8 @@ kaa_add_unit_test(NAME test_kaa_extension_private
 #        INC_DIRS
 #        test)
 
-# KAA-988
-#kaa_add_unit_test(NAME test_kaa_channel_manager
-#        SOURCES
-#        test/test_kaa_channel_manager.c
-#        DEPENDS
-#        kaac ${OPENSSL_LIBRARIES})
+kaa_add_unit_test(NAME test_kaa_channel_manager
+        SOURCES
+        test/test_kaa_channel_manager.c
+        DEPENDS
+        kaac ${OPENSSL_LIBRARIES})

client/client-multi/client-c/listfiles/platform/cc32xx/CMakeLists.txt

@@ -19,14 +19,13 @@ set(KAA_SOURCE_FILES
         ${KAA_SRC_FOLDER}/platform-impl/posix/kaa_client.c
         ${KAA_SRC_FOLDER}/platform-impl/common/kaa_failover_strategy.c
         ${KAA_SRC_FOLDER}/platform-impl/common/sha.c
-        ${KAA_SRC_FOLDER}/platform-impl/common/sha1.c
         ${KAA_SRC_FOLDER}/platform-impl/cc32xx/logger.c
         ${KAA_SRC_FOLDER}/platform-impl/cc32xx/file_utils.c
-        ${KAA_SRC_FOLDER}/platform-impl/cc32xx/key_utils.c
         ${KAA_SRC_FOLDER}/platform-impl/cc32xx/status.c
         ${KAA_SRC_FOLDER}/platform-impl/cc32xx/configuration_persistence.c
         ${KAA_SRC_FOLDER}/platform-impl/cc32xx/time.c
         ${KAA_SRC_FOLDER}/platform-impl/cc32xx/reboot.c
+        ${KAA_SRC_FOLDER}/platform-impl/common/common_key_utils.c
         ${KAA_SRC_FOLDER}/platform-impl/common/ext_log_storage_memory.c
         ${KAA_SRC_FOLDER}/platform-impl/common/ext_log_upload_strategies.c
         )
@@ -69,9 +68,3 @@ add_definitions(-DCC32XX_PLATFORM)
 set(KAA_THIRDPARTY_LIBRARIES driver simplelink_nonos)
 
 set(KAA_BUILD_STATIC_ONLY 1)
-
-set(CC32XX_RSA_KEY ${CMAKE_CURRENT_BINARY_DIR}/cc32xx_rsa_key.h)
-
-execute_process(COMMAND rm ${CC32XX_RSA_KEY})
-execute_process(COMMAND java -jar ${KAA_SDK_DIR}/tools/pub_key_generator.jar ${CC32XX_RSA_KEY})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})

client/client-multi/client-c/listfiles/platform/esp8266/CMakeLists.txt

@@ -26,13 +26,12 @@ set(ESP8266_SRC
     ${ESP8266_SRC_FOLDER}/kaa_client.c
     ${ESP8266_SRC_FOLDER}/configuration_persistence.c
     ${ESP8266_SRC_FOLDER}/status.c
-    ${ESP8266_SRC_FOLDER}/key_utils.c
     ${ESP8266_SRC_FOLDER}/tcp_utils.c
     ${ESP8266_SRC_FOLDER}/time.c
+    ${KAA_SRC_FOLDER}/platform-impl/common/common_key_utils.c
     ${ESP8266_SRC_FOLDER}/exit.c
     ${ESP8266_SRC_FOLDER}/snprintf.c
     ${KAA_SRC_FOLDER}/platform-impl/common/sha.c
-    ${KAA_SRC_FOLDER}/platform-impl/common/sha1.c
     ${KAA_SRC_FOLDER}/platform-impl/common/kaa_failover_strategy.c
     ${KAA_SRC_FOLDER}/platform-impl/common/ext_log_storage_memory.c
     ${KAA_SRC_FOLDER}/platform-impl/common/ext_log_upload_strategies.c
@@ -46,7 +45,3 @@ set(KAA_SOURCE_FILES ${KAA_SOURCE_FILES} ${ESP8266_SRC})
 set(KAA_INCLUDE_PATHS ${KAA_INCLUDE_PATHS} ${ESP8266_INCDIRS} ${ESP8266_SRC_FOLDER})
 
 set(KAA_BUILD_STATIC_ONLY 1)
-
-execute_process(COMMAND java -jar ${CMAKE_CURRENT_SOURCE_DIR}/tools/pub_key_generator.jar
-                ${CMAKE_CURRENT_BINARY_DIR}/rsa.h)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})

client/client-multi/client-c/listfiles/platform/x86-64/CMakeLists.txt → client/client-multi/client-c/listfiles/platform/posix/CMakeLists.txt

@@ -14,24 +14,22 @@
 # limitations under the License.
 #
 
-find_package(OpenSSL REQUIRED)
-
-set(KAA_SOURCE_FILES 
+set(KAA_SOURCE_FILES
         ${KAA_SOURCE_FILES}
         ${KAA_SRC_FOLDER}/platform-impl/posix/kaa_client.c
-        ${KAA_SRC_FOLDER}/platform-impl/posix/sha.c
         ${KAA_SRC_FOLDER}/platform-impl/posix/logger.c
         ${KAA_SRC_FOLDER}/platform-impl/posix/file_utils.c
-        ${KAA_SRC_FOLDER}/platform-impl/posix/key_utils.c
         ${KAA_SRC_FOLDER}/platform-impl/posix/status.c
         ${KAA_SRC_FOLDER}/platform-impl/posix/configuration_persistence.c
+        ${KAA_SRC_FOLDER}/platform-impl/common/sha.c
+        ${KAA_SRC_FOLDER}/platform-impl/common/common_key_utils.c
         ${KAA_SRC_FOLDER}/platform-impl/common/kaa_failover_strategy.c
         ${KAA_SRC_FOLDER}/platform-impl/common/ext_log_storage_memory.c
         ${KAA_SRC_FOLDER}/platform-impl/common/ext_log_upload_strategies.c
     )
 
 if(NOT KAA_WITHOUT_TCP_CHANNEL)
-    set(KAA_SOURCE_FILES 
+    set(KAA_SOURCE_FILES
             ${KAA_SOURCE_FILES}
             ${KAA_SRC_FOLDER}/kaa_protocols/kaa_tcp/kaatcp_parser.c
             ${KAA_SRC_FOLDER}/kaa_protocols/kaa_tcp/kaatcp_request.c
@@ -40,11 +38,4 @@ if(NOT KAA_WITHOUT_TCP_CHANNEL)
         )
 endif()
 
-set(KAA_THIRDPARTY_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
-
 set(KAA_INCLUDE_PATHS ${KAA_SRC_FOLDER}/platform-impl/posix)
-
-set(KAA_THIRDPARTY_LIBRARIES
-        ${KAA_THIRDPARTY_LIBRARIES} 
-        ${OPENSSL_LIBRARIES}
-    )

client/client-multi/client-c/pom.xml

@@ -77,17 +77,15 @@
 
                         <exclude>build-posix/gcovr-report.xml</exclude>
 
-                        <!-- SHA implementation from RFC 3174 -->
-                        <exclude>src/kaa/platform-impl/common/sha1.h</exclude>
-                        <exclude>src/kaa/platform-impl/common/sha1.c</exclude>
-
                         <exclude>src/kaa/platform-impl/esp8266/snprintf.c</exclude>
 
                         <exclude>gcovr</exclude>
 
                         <exclude>docs/</exclude>
+                        <exclude>thirdparty/</exclude>
                         <exclude>nix/astyle/max_indent.patch</exclude>
 
+                        <exclude>src/kaa/gen/kaa_keys_gen.h</exclude>
                         <!-- Temporary build files -->
                         <exclude>build-*/</exclude>
                         <exclude>Makefile</exclude>
@@ -110,7 +108,6 @@
                         <configuration>
                             <excludes>
                                 <exclude>**/avro_src/**</exclude>
-                                <exclude>**/platform-impl/common/sha1.h</exclude>
                                 <exclude>**/sha1.c</exclude>
                                 <exclude>**/snprintf.c</exclude>
                             </excludes>

client/client-multi/client-c/src/extensions/profile/kaa_profile.c

@@ -250,21 +250,15 @@ kaa_error_t kaa_profile_request_get_size(kaa_profile_manager_t *self, size_t *ex
 #endif
 
     if (!self->status->is_registered) {
-        bool need_deallocation = false;
-
         if (!self->extension_data->public_key.buffer) {
-            ext_get_endpoint_public_key((char **)&self->extension_data->public_key.buffer
-                                      , (size_t *)&self->extension_data->public_key.size
-                                      , &need_deallocation);
+            ext_get_endpoint_public_key((uint8_t **)&self->extension_data->public_key.buffer,
+                                        (size_t *)&self->extension_data->public_key.size);
         }
 
         if (self->extension_data->public_key.buffer && self->extension_data->public_key.size > 0) {
             *expected_size += sizeof(uint32_t); // public key size
             *expected_size += kaa_aligned_size_get(self->extension_data->public_key.size); // public key
 
-            if (need_deallocation) {
-                self->extension_data->public_key.destroy = kaa_data_destroy;
-            }
         } else {
             return KAA_ERR_BADDATA;
         }

client/client-multi/client-c/src/kaa/kaa.c

@@ -118,8 +118,9 @@ kaa_error_t kaa_init(kaa_context_t **kaa_context_p)
     // Initialize logger
     kaa_logger_t *logger = NULL;
     kaa_error_t error = kaa_log_create(&logger, KAA_MAX_LOG_MESSAGE_LENGTH, KAA_MAX_LOG_LEVEL, NULL); // TODO: make log destination configurable
-    if (error)
+    if (error) {
         return error;
+    }
 
     KAA_LOG_INFO(logger, KAA_ERR_NONE, "Kaa SDK version %s, commit hash %s", KAA_BUILD_VERSION, KAA_BUILD_COMMIT_HASH);
 
@@ -133,35 +134,19 @@ kaa_error_t kaa_init(kaa_context_t **kaa_context_p)
     }
 
     // Initialize endpoint identity
-    char *pub_key_buffer = NULL;
-    size_t pub_key_buffer_size = 0;
-    bool need_deallocation = false;
-
-    ext_get_endpoint_public_key(&pub_key_buffer, &pub_key_buffer_size, &need_deallocation);
-
-    kaa_digest pub_key_hash;
-    error = ext_calculate_sha_hash(pub_key_buffer, pub_key_buffer_size, pub_key_hash);
-
-    if (need_deallocation && pub_key_buffer_size > 0) {
-        KAA_FREE(pub_key_buffer);
-    }
+    uint8_t *sha1 = NULL;
+    size_t sha1_size = 0;
 
+    error = kaa_init_keys();
     if (error) {
-        KAA_LOG_FATAL(logger, error, "Failed to calculate EP ID");
+        KAA_LOG_ERROR(logger, error, "Failed to initialize keys");
         kaa_context_destroy(*kaa_context_p);
-        *kaa_context_p = NULL;
         kaa_log_destroy(logger);
         return error;
     }
 
-    error = ext_copy_sha_hash((*kaa_context_p)->status->status_instance->endpoint_public_key_hash, pub_key_hash);
-    if (error) {
-        KAA_LOG_FATAL(logger, error, "Failed to set Endpoint public key");
-        kaa_context_destroy(*kaa_context_p);
-        *kaa_context_p = NULL;
-        kaa_log_destroy(logger);
-        return error;
-    }
+    ext_get_sha1_public(&sha1, &sha1_size);
+    ext_copy_sha_hash((*kaa_context_p)->status->status_instance->endpoint_public_key_hash, sha1);
 
     return kaa_status_set_updated((*kaa_context_p)->status->status_instance, true);
 }
@@ -201,9 +186,11 @@ kaa_error_t kaa_deinit(kaa_context_t *kaa_context)
 
     kaa_logger_t *logger = kaa_context->logger;
     kaa_error_t error = kaa_context_destroy(kaa_context);
-    if (error)
+    if (error) {
         KAA_LOG_ERROR(logger, error, "Failed to destroy Kaa context");
+    }
     kaa_log_destroy(logger);
+    kaa_deinit_keys();
     return error;
 }