KAA-1283: Review all C++ code samples in new Documentation

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

@@ -166,7 +166,6 @@ set(KAA_SOURCE_FILES
         ${KAA_SRC_FOLDER}/avro_src/io.c
         ${KAA_SRC_FOLDER}/avro_src/encoding_binary.c
         ${KAA_SRC_FOLDER}/collections/kaa_list.c
-        ${KAA_SRC_FOLDER}/utilities/kaa_aes_rsa.c
         ${KAA_SRC_FOLDER}/utilities/kaa_log.c
         ${KAA_SRC_FOLDER}/utilities/kaa_mem.c
         ${KAA_SRC_FOLDER}/utilities/kaa_buffer.c
@@ -178,27 +177,38 @@ set(KAA_SOURCE_FILES
         ${KAA_SRC_FOLDER}/kaa.c
         ${KAA_SRC_FOLDER}/kaa_extension.c
         ${KAA_SRC_FOLDER}/platform-impl/common/kaa_htonll.c
-  )
+)
+
+if(WITH_ENCRYPTION)
+    set(KAA_SOURCE_FILES
+        ${KAA_SOURCE_FILES}
+        ${KAA_SRC_FOLDER}/utilities/kaa_aes_rsa.c
+        ${KAA_SRC_FOLDER}/platform-impl/common/encryption_utils.c)
+endif(WITH_ENCRYPTION)
 
 
 # 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
+        ${KAA_INCLUDE_PATHS}
         ${CMAKE_CURRENT_LIST_DIR}/src
-        ${CMAKE_CURRENT_LIST_DIR}/thirdparty/mbedtls
         ${KAA_SRC_FOLDER}
         ${KAA_THIRDPARTY_INCLUDE_DIR})
 
 # Build unit tests.
 include(${CMAKE_CURRENT_LIST_DIR}/listfiles/UnitTest.cmake)
 
+include_directories(SYSTEM ${KAA_INCLUDE_PATHS})
+
+# This already includes mbedtls
+add_subdirectory(tools/kaa_encryption/rsa_key_gen)
+
 # Build Kaa libraries.
 add_library(kaac ${KAA_SOURCE_FILES})
 target_include_directories(kaac PUBLIC ${KAA_INCLUDE_DIRS})
-target_link_libraries(kaac PRIVATE ${KAA_THIRDPARTY_LIBRARIES})
+target_link_libraries(kaac PRIVATE ${KAA_THIRDPARTY_LIBRARIES} mbedtls)
 
 message("BOOTSTRAP ENABLED")
 include(${CMAKE_CURRENT_LIST_DIR}/src/extensions/bootstrap/CMakeLists.txt)
@@ -281,7 +291,6 @@ if(${KAA_PLATFORM} STREQUAL "posix")
     if(${KAA_RUNTIME_KEY_GENERATION})
         add_definitions(-DKAA_RUNTIME_KEY_GENERATION)
     endif()
-    add_subdirectory(tools/kaa_encryption/rsa_key_gen)
     target_link_libraries(kaac PUBLIC rsa_keygen)
 else()
     add_dependencies(kaac kaa_rsa_keygen)

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

@@ -28,13 +28,13 @@ set(ESP8266_SRC
     ${ESP8266_SRC_FOLDER}/status.c
     ${ESP8266_SRC_FOLDER}/tcp_utils.c
     ${ESP8266_SRC_FOLDER}/time.c
-    ${KAA_SRC_FOLDER}/platform-impl/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/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
+    ${KAA_SRC_FOLDER}/platform-impl/common/key_utils.c
     ${KAA_SRC_FOLDER}/platform-impl/common/kaa_tcp_channel.c
     ${KAA_SRC_FOLDER}/kaa_protocols/kaa_tcp/kaatcp_parser.c
     ${KAA_SRC_FOLDER}/kaa_protocols/kaa_tcp/kaatcp_request.c

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

@@ -17,7 +17,6 @@
 set(KAA_SOURCE_FILES
         ${KAA_SOURCE_FILES}
         ${KAA_SRC_FOLDER}/platform-impl/posix/kaa_client.c
-        ${KAA_SRC_FOLDER}/platform-impl/posix/key_utils.c
         ${KAA_SRC_FOLDER}/platform-impl/posix/logger.c
         ${KAA_SRC_FOLDER}/platform-impl/posix/file_utils.c
         ${KAA_SRC_FOLDER}/platform-impl/posix/status.c
@@ -26,6 +25,7 @@ set(KAA_SOURCE_FILES
         ${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
+        ${KAA_SRC_FOLDER}/platform-impl/common/key_utils.c
     )
 
 if(NOT KAA_WITHOUT_TCP_CHANNEL)

client/client-multi/client-c/src/extensions/logging/kaa_logging.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <sys/types.h>
-#include <assert.h>
 #include "platform/stdio.h"
 #include "platform/sock.h"
 #include "platform/time.h"

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

@@ -251,7 +251,7 @@ kaa_error_t kaa_profile_request_get_size(kaa_profile_manager_t *self, size_t *ex
 
     if (!self->status->is_registered) {
         if (!self->extension_data->public_key.buffer) {
-            ext_get_endpoint_public_key((uint8_t **)&self->extension_data->public_key.buffer,
+            ext_get_endpoint_public_key((const uint8_t **)&self->extension_data->public_key.buffer,
                                         (size_t *)&self->extension_data->public_key.size);
         }
 

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

@@ -30,6 +30,10 @@
 #include "kaa_defaults.h"
 #include "platform/ext_key_utils.h"
 
+#ifdef KAA_ENCRYPTION
+#include "platform/ext_encryption_utils.h"
+#endif
+
 #include <kaa_extension.h>
 
 #ifndef KAA_DISABLE_FEATURE_PROFILE
@@ -111,6 +115,26 @@ static kaa_error_t kaa_context_destroy(kaa_context_t *context)
     return KAA_ERR_NONE;
 }
 
+static kaa_error_t kaa_init_keys(void)
+{
+    kaa_error_t error = kaa_init_rsa_keypair();
+    if (error) {
+        return error;
+    }
+#ifdef KAA_ENCRYPTION
+    error = kaa_init_session_key();
+    if (error) {
+        return error;
+    }
+#endif
+    return error;
+}
+
+static void kaa_deinit_keys(void)
+{
+    kaa_deinit_rsa_keypair();
+}
+
 kaa_error_t kaa_init(kaa_context_t **kaa_context_p)
 {
     KAA_RETURN_IF_NIL(kaa_context_p, KAA_ERR_BADPARAM);

client/client-multi/client-c/src/kaa/platform-impl/common/encryption_utils.c

@@ -0,0 +1,155 @@
+/*
+ *  Copyright 2014-2016 CyberVision, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "platform/ext_encryption_utils.h"
+#include "platform/ext_key_utils.h"
+
+#include <stdbool.h>
+#include <string.h>
+
+#include <utilities/kaa_aes_rsa.h>
+
+#include <mbedtls/pk.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/md.h>
+
+#define ENCRYPTED_SESSION_KEY_LENGTH   256
+#define KAA_SIGNATURE_LENGTH           256
+#define AES_ECB_ENCRYPTION_CHUNK_SIZE  16
+
+extern mbedtls_pk_context kaa_pk_context_;
+
+/**
+ * Contains Endpoint keys.
+ *
+ * The main purpose of the structure is
+ * caching calculated keys.
+ */
+static struct {
+    uint8_t session_key[KAA_SESSION_KEY_LENGTH];
+    uint8_t encrypted_session_key[ENCRYPTED_SESSION_KEY_LENGTH];
+    uint8_t signature[KAA_SIGNATURE_LENGTH];
+    size_t  session_key_length;
+} keys;
+
+kaa_error_t kaa_init_session_key(void)
+{
+    /* Initialization should be performed only once */
+    static bool initialized = false;
+    if (!initialized) {
+        /* Generate session key */
+        if (init_aes_key(keys.session_key, KAA_SESSION_KEY_LENGTH)) {
+            return KAA_ERR_BADDATA;
+        }
+
+        keys.session_key_length = KAA_SESSION_KEY_LENGTH;
+        initialized = true;
+    }
+
+    return KAA_ERR_NONE;
+}
+
+void ext_get_endpoint_session_key(const uint8_t **buffer, size_t *buffer_size)
+{
+    if (buffer == NULL || buffer_size == 0) {
+        return;
+    }
+    *buffer = keys.session_key;
+    *buffer_size = keys.session_key_length;
+}
+
+/* Get encrypted session key (enctypted with remote key) */
+kaa_error_t ext_get_encrypted_session_key(uint8_t **buffer, size_t *buffer_size,
+        const uint8_t *remote_key, size_t remote_key_size)
+{
+    if (buffer == NULL || buffer_size == NULL || remote_key == NULL || remote_key_size == 0) {
+        return KAA_ERR_BADPARAM;
+    }
+
+    kaa_error_t err = rsa_encrypt(remote_key, remote_key_size, keys.session_key,
+            KAA_SESSION_KEY_LENGTH, keys.encrypted_session_key);
+    if (err) {
+        return err;
+    }
+
+    *buffer = keys.encrypted_session_key;
+    *buffer_size = ENCRYPTED_SESSION_KEY_LENGTH;
+
+    return err;
+}
+size_t ext_get_encrypted_data_size(size_t input_size)
+{
+    if (input_size == 0) {
+        return 0;
+    }
+
+    return input_size + AES_ECB_ENCRYPTION_CHUNK_SIZE -
+        (input_size % AES_ECB_ENCRYPTION_CHUNK_SIZE);
+}
+
+kaa_error_t ext_encrypt_data(const uint8_t *input, size_t payload_size, uint8_t *output)
+{
+    if (input == NULL || payload_size == 0 || output == NULL) {
+        return KAA_ERR_BADPARAM;
+    }
+
+    /* Adding PKCS7 padding */
+    size_t enc_data_size = ext_get_encrypted_data_size(payload_size);
+    uint8_t padding = enc_data_size - payload_size;
+    memset(output + payload_size, padding, padding);
+
+    return aes_encrypt_decrypt(MBEDTLS_AES_ENCRYPT, input, enc_data_size,
+            output, keys.session_key);
+}
+
+kaa_error_t ext_decrypt_data(const uint8_t *input, size_t input_size,
+        uint8_t *output, size_t *output_size)
+{
+    if (input == NULL || input_size == 0 || output == NULL || output_size == 0) {
+        return KAA_ERR_BADPARAM;
+    }
+
+    if (aes_encrypt_decrypt(MBEDTLS_AES_DECRYPT, input, input_size,
+                output, keys.session_key)) {
+        return KAA_ERR_BADPARAM;
+    }
+
+    /* Reduce PKCS7 padding */
+    uint8_t padding_length = *(output+input_size - 1);
+    *output_size = input_size - padding_length;
+
+    return KAA_ERR_NONE;
+}
+
+kaa_error_t ext_get_signature(const uint8_t *input, size_t input_size,
+        uint8_t **output, size_t *output_size)
+{
+    if (!input || !input_size || !output || !output_size) {
+        return KAA_ERR_BADPARAM;
+    }
+
+    kaa_error_t error = rsa_sign(&kaa_pk_context_, input, input_size, keys.signature, output_size);
+
+    if (error) {
+        return KAA_ERR_BADDATA;
+    }
+    *output = keys.signature;
+    *output_size = KAA_SIGNATURE_LENGTH;
+
+    return KAA_ERR_NONE;
+}
+

client/client-multi/client-c/src/kaa/platform-impl/common/kaa_tcp_channel.c

@@ -33,7 +33,7 @@
 #include "platform/ext_system_logger.h"
 #include <platform/time.h>
 #include "kaa_platform_common.h"
-#include "platform/ext_key_utils.h"
+#include "platform/ext_encryption_utils.h"
 #include "kaa_tcp_channel.h"
 #include "kaa_context.h"
 #include "kaa_channel_manager.h"