From 158a2408776833dbf90ddb4e2ec6c040fd8d2c3a Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Sun, 3 May 2020 00:41:41 +0700
Subject: [PATCH] [*] Build fixes
---
CMakeLists.txt | 2 +-
libdap-crypto/src/dap_enc_key.c | 2 +-
libdap/include/dap_common.h | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 399919d940..f63a1ccd34 100644
--- a/CMakeLists.txt
+++ b/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}\"")
diff --git a/libdap-crypto/src/dap_enc_key.c b/libdap-crypto/src/dap_enc_key.c
index a85f3efd57..4d0812b5e9 100755
--- a/libdap-crypto/src/dap_enc_key.c
+++ b/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"
diff --git a/libdap/include/dap_common.h b/libdap/include/dap_common.h
index c858ac97ca..6da42d7977 100755
--- a/libdap/include/dap_common.h
+++ b/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 *) );
--
GitLab