From 10ee49ab4ba2354c4710deb94b9bb51cd4badf6b Mon Sep 17 00:00:00 2001
From: armatusmiles <akurotych@gmail.com>
Date: Sun, 26 Aug 2018 13:17:12 +0300
Subject: [PATCH] [*] Code review
---
core/CMakeLists.txt | 2 --
crypto/CMakeLists.txt | 2 --
crypto/dap_enc.c | 2 +-
crypto/dap_enc.h | 4 ++--
crypto/dap_enc_aes.h | 1 -
crypto/dap_enc_key.h | 4 ++--
crypto/dap_enc_sidh16.c | 7 -------
crypto/dap_enc_sidh16.h | 2 --
libdap.pri | 1 -
9 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 0f3bb9a..e438fdd 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -8,5 +8,3 @@ add_library(${PROJECT_NAME} STATIC ${CORE_SRCS} ${CORE_HEADERS})
#This paths will be used by project-dependent project libraries
target_include_directories(dap_core INTERFACE .)
-
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 262ca96..feed458 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -50,5 +50,3 @@ add_library(${PROJECT_NAME} STATIC ${CRYPTO_SRCS}
target_include_directories(dap_crypto INTERFACE .)
target_link_libraries(dap_crypto dap_core)
-
-set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
diff --git a/crypto/dap_enc.c b/crypto/dap_enc.c
index bf3a461..0667b73 100644
--- a/crypto/dap_enc.c
+++ b/crypto/dap_enc.c
@@ -117,7 +117,7 @@ size_t dap_enc_decode(struct dap_enc_key * key,const void * buf, const size_t bu
if(key->dec){
size_t ret=key->dec(key,proc_buf_const,proc_buf_size,buf_out);
- if(data_type_in==DAP_ENC_DATA_TYPE_B64 || DAP_ENC_DATA_TYPE_B64_URLSAFE)
+ if(data_type_in==DAP_ENC_DATA_TYPE_B64 || data_type_in == DAP_ENC_DATA_TYPE_B64_URLSAFE)
if (proc_buf)
free(proc_buf);
return ret;
diff --git a/crypto/dap_enc.h b/crypto/dap_enc.h
index f6efe8d..e869a5b 100644
--- a/crypto/dap_enc.h
+++ b/crypto/dap_enc.h
@@ -29,8 +29,8 @@
extern "C" {
#endif
-int dap_enc_init();
-void dap_enc_deinit();
+int dap_enc_init(void);
+void dap_enc_deinit(void);
size_t dap_enc_code(struct dap_enc_key * key, const void * buf, const size_t buf_size, void * buf_out,
dap_enc_data_type_t data_type_out);
diff --git a/crypto/dap_enc_aes.h b/crypto/dap_enc_aes.h
index cf7e38f..a5c6c95 100755
--- a/crypto/dap_enc_aes.h
+++ b/crypto/dap_enc_aes.h
@@ -16,7 +16,6 @@ void dap_enc_aes_key_new_generate(struct dap_enc_key * a_key,size_t a_size);
void dap_enc_aes_key_new_from_data(struct dap_enc_key * a_key, const void * a_in, size_t a_in_size);
void dap_enc_aes_key_new_from_str(struct dap_enc_key * a_key, const char * a_in);
void dap_enc_aes_key_delete(struct dap_enc_key *a_key);
-int test_key_aes();
size_t dap_enc_aes_decode(struct dap_enc_key* a_key, const void * a_in, size_t a_in_size,void * a_out);
size_t dap_enc_aes_encode(struct dap_enc_key* a_key, const void * a_in, size_t a_in_size,void * a_out);
diff --git a/crypto/dap_enc_key.h b/crypto/dap_enc_key.h
index 20bd576..6d9bf36 100644
--- a/crypto/dap_enc_key.h
+++ b/crypto/dap_enc_key.h
@@ -121,8 +121,8 @@ typedef struct dap_enc_key{
void * _inheritor;
} dap_enc_key_t;
-int dap_enc_key_init();
-void dap_enc_key_deinit();
+int dap_enc_key_init(void);
+void dap_enc_key_deinit(void);
dap_enc_key_t *dap_enc_key_new(dap_enc_key_type_t a_key_type);
diff --git a/crypto/dap_enc_sidh16.c b/crypto/dap_enc_sidh16.c
index e0cc9a8..808fba8 100644
--- a/crypto/dap_enc_sidh16.c
+++ b/crypto/dap_enc_sidh16.c
@@ -23,13 +23,6 @@ static int isCompressed(void *_inheritor) {
return 0;
}
-void test(){
-
-}
-
-
-
-
extern bool dap_sidh16_CurveIsogenyStruct_isnull(PCurveIsogenyStruct pCurveIsogeny);
void dap_enc_sidh16_key_new_generate(struct dap_enc_key *a_key, size_t a_size) {
diff --git a/crypto/dap_enc_sidh16.h b/crypto/dap_enc_sidh16.h
index 073038e..73371fb 100644
--- a/crypto/dap_enc_sidh16.h
+++ b/crypto/dap_enc_sidh16.h
@@ -13,8 +13,6 @@
#include"liboqs/kex_sidh_cln16/SIDH.h"
#include "liboqs/kex/kex.h"
-
-
struct dap_enc_key;
extern bool dap_sidh16_CurveIsogenyStruct_isnull(PCurveIsogenyStruct pCurveIsogeny);
diff --git a/libdap.pri b/libdap.pri
index 84e3df1..459a787 100644
--- a/libdap.pri
+++ b/libdap.pri
@@ -1,5 +1,4 @@
include (core/core.pri)
include (crypto/crypto.pri)
-
INCLUDEPATH += $$PWD
--
GitLab