[*] Build fixes

CMakeLists.txt

@@ -2,7 +2,7 @@ project(cellframe-sdk C)
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_C_STANDARD 11)
-set(CELLFRAME_SDK_NATIVE_VERSION "1.3-6")
+set(CELLFRAME_SDK_NATIVE_VERSION "1.4-0")
 include(cmake/OS_Detection.cmake)
 add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
 

libdap-crypto/src/dap_enc_key.c

@@ -27,7 +27,7 @@
 #include "dap_enc_oaes.h"
 #include "dap_enc_bf.h"
 #include "dap_enc_GOST.h"
-//#include "dap_enc_salsa2012.h"
+#include "dap_enc_salsa2012.h"
 
 #include "dap_enc_msrln.h"
 #include "dap_enc_defeo.h"

libdap/include/dap_common.h

@@ -106,6 +106,8 @@ typedef uint8_t byte_t;
   #define DAP_DUP_SIZE(a,b)       ( __typeof(a) memcpy(ret,a,b) )
 #endif
 
+#define DAP_DEL_Z(a)          if(a) { DAP_DELETE(a); a=NULL;}
+
 DAP_STATIC_INLINE void *_dap_aligned_alloc( uintptr_t alignment, uintptr_t size )
 {
     uintptr_t ptr = (uintptr_t) DAP_MALLOC( size + (alignment * 2) + sizeof(void *) );