Merge pull request #22 from CreatorDev/dev

merge dev to master

Author: mar3kk

.travis.yml

@@ -13,5 +13,7 @@ script:
   - cd $HOME/build && wget $CI40_FILE_URL && tar xfj $CI40_SDK.tar.bz2
   - cd $CI40_SDK && ./scripts/feeds update -a && ./scripts/feeds install -a
   - sed -i '/^PKG_SOURCE/ d' feeds/creatordev/provisioning-daemon/Makefile
+  - make package/letmecreate/compile
+  - make package/glib2/compile
   - make package/provisioning-daemon/prepare USE_SOURCE_DIR=$TRAVIS_BUILD_DIR V=s
   - make package/provisioning-daemon/compile V=s

provisioning-daemon/files/etc/config/provisioning_daemon

@@ -6,7 +6,7 @@ PORT=49300
 
 #Turns on/off possibility to control provision process through uBus commands.
 #Default value is false
-REMOTE_PROVISION_CTRL=false
+REMOTE_PROVISION_CTRL=true
 
 #Turns on/off possibility to control provision process through buttons on ci40.
 #Default value is true

provisioning-daemon/src/CMakeLists.txt

@@ -2,6 +2,7 @@
 ########################
 file (GLOB src *.c*)
 ADD_EXECUTABLE(provisioning_daemon_appd ${src})
+
 # Add library targets
 #####################
 FIND_LIBRARY(LIB_LMC libletmecreate_core.so ${STAGING_DIR}/usr/lib)

provisioning-daemon/src/clicker.c

@@ -32,6 +32,7 @@
 #include "utils.h"
 #include "commands.h"
 #include "crypto/crypto_config.h"
+#include <pthread.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdbool.h>
@@ -46,6 +47,7 @@ static GQueue* _ClickersQueue = NULL;
 static GMutex _Mutex;
 
 static void Destroy(Clicker *clicker) {
+    g_message("clicker destroy called %p", clicker);
     dh_Release(&clicker->keysExchanger);
     G_FREE_AND_NULL(clicker->localKey);
     G_FREE_AND_NULL(clicker->remoteKey);
@@ -58,6 +60,7 @@ static void Destroy(Clicker *clicker) {
 }
 
 static void ReleaseClickerIfNotOwned(Clicker* clicker) {
+
     //NOTE: Should be called in critical section only!
     if (clicker->ownershipsCount > 0) {
         return;
@@ -166,7 +169,6 @@ Clicker *clicker_AcquireOwnership(int clickerID)
 
     if (clicker != NULL)
         g_mutex_lock(&clicker->ownershipLock);
-
     return clicker;
 }
 

provisioning-daemon/src/clicker_sm.c

@@ -74,7 +74,6 @@ static void GenerateSharedClickerKey(int clickerId)
     PRINT_BYTES(clicker->sharedKey, clicker->sharedKeyLength);
 
     clicker_ReleaseOwnership(clicker);
-
     event_PushEventWithInt(EventType_TRY_TO_SEND_PSK_TO_CLICKER, clickerId);
 }
 
@@ -195,7 +194,6 @@ static void ObtainedPSK(PreSharedKey* pskData) {
     strlcpy((char*)clicker->identity, pskData->identity, pskData->identityLen + 1);
 
     clicker_ReleaseOwnership(clicker);
-
     event_PushEventWithInt(EventType_HISTORY_ADD, pskData->clickerId);
     event_PushEventWithInt(EventType_TRY_TO_SEND_PSK_TO_CLICKER, pskData->clickerId);
 }

provisioning-daemon/src/crypto/encoder.c

@@ -55,7 +55,9 @@ uint8_t* softap_EncodeBytes(uint8_t* src, uint8_t len, uint8_t* key, uint8_t* ou
     for (t = 0; t < paddedSize; t += 16) {
         IV[15] = t / 16;
         for (y = 0; y < 16; y++) {
-            src[t + y] ^= IV[y];
+            if (t + y < len) {
+                src[t + y] ^= IV[y];
+            }
         }
         rijndael_encrypt(&ctx, src + t, result + t);
     }

provisioning-daemon/src/provisioning_daemon.c

@@ -107,6 +107,8 @@ GMutex _LogMutex;
 static void CtrlCHandler(int signal)
 {
     g_message("Exit triggered...");
+    fflush(stdout);
+    fflush(stderr);
     _KeepRunning = false;
 }