From a9c3b9a13e822e345bea455336ca87728f444cbf Mon Sep 17 00:00:00 2001
From: Ivan Deniskin <ivanmordwin@yandex.ru>
Date: Wed, 4 Jul 2018 14:55:34 +0300
Subject: [PATCH] Warning fixes
---
client/dap_client.c | 5 ++-
client/dap_client_internal.c | 4 +-
core/dap_config.c | 12 +++++-
crypto/dap_enc_aes.c | 4 +-
crypto/dap_enc_base64.c | 5 ++-
crypto/dap_enc_msrln16.c | 24 ++++++-----
crypto/dap_enc_msrln16.h | 2 +-
crypto/dap_enc_newhope.c | 32 +++++++++++----
crypto/dap_enc_sidh16.c | 40 ++++++++-----------
crypto/dap_enc_sidh16.h | 2 +-
crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.c | 2 +-
http/dap_http_client.c | 14 +++++--
http/dap_http_client_simple.c | 1 -
13 files changed, 90 insertions(+), 57 deletions(-)
diff --git a/client/dap_client.c b/client/dap_client.c
index ae2ed40..0b39960 100644
--- a/client/dap_client.c
+++ b/client/dap_client.c
@@ -3,6 +3,7 @@
#include "dap_common.h"
#include "dap_http_client.h"
+#include "dap_http_client_simple.h"
#include "dap_client.h"
#include "dap_client_internal.h"
@@ -75,7 +76,7 @@ MEM_ALLOC_ERR:
if (l_client)
free (l_client);
-
+ return NULL;
}
/**
@@ -171,7 +172,7 @@ void dap_client_go_stage(dap_client_t * a_client, dap_client_stage_t a_stage_tar
*/
void m_stage_fsm_operator(dap_client_t * a_client, void * a_arg)
{
- (void *) a_arg;
+ (void)a_arg;
dap_client_internal_t * l_client_internal = DAP_CLIENT_INTERNAL(a_client);
if (l_client_internal->stage_target == l_client_internal->stage){
log_it(L_WARNING, "FSM Op: current stage %s is same as target one, nothing to do",
diff --git a/client/dap_client_internal.c b/client/dap_client_internal.c
index 4516968..ebbe7e0 100644
--- a/client/dap_client_internal.c
+++ b/client/dap_client_internal.c
@@ -327,7 +327,6 @@ void dap_client_internal_request_enc(dap_client_internal_t * a_client_internal,
a_client_internal->request_response_callback = a_response_proc;
a_client_internal->request_error_callback = a_response_error;
a_client_internal->is_encrypted = true;
- size_t i;
dap_enc_data_type_t l_enc_type;
if( a_client_internal->uplink_protocol_version >= 21 )
@@ -555,10 +554,10 @@ void m_auth_response(dap_client_t * a_client, void * a_data, size_t a_data_size)
*/
int m_auth_response_parse(XMLEvent event, const XMLNode* node, SXML_CHAR* text, const int n, SAX_Data* sd)
{
+ (void)n;
dap_client_t * l_client = (dap_client_t *) sd->user;
dap_client_internal_t * l_client_internal = DAP_CLIENT_INTERNAL( l_client );
- char * l_node_text =node ? ( node->text? node->text : "(NULL)") : "(NULL)" ;
switch (event) {
//case XML_EVENT_START_NODE: last_parsed_node = strdup ( node->text) return start_node(node, sd);
case XML_EVENT_TEXT:
@@ -649,7 +648,6 @@ void m_stream_ctl_response(dap_client_t * a_client, void * a_data, size_t a_data
char l_stream_id[25]={0};
char *l_stream_key = DAP_NEW_Z_SIZE(char,4096*3);
void * l_stream_key_raw = DAP_NEW_Z_SIZE(char,4096);
- size_t l_stream_key_raw_size = 0;
uint32_t l_remote_protocol_version;
l_arg_count = sscanf(l_response_str,"%25s %4096s %u"
diff --git a/core/dap_config.c b/core/dap_config.c
index 47dd1d9..ce16186 100644
--- a/core/dap_config.c
+++ b/core/dap_config.c
@@ -48,7 +48,9 @@ int dap_config_init(const char * a_configs_path)
char cmd[1024];
snprintf(cmd,sizeof(cmd),"test -d %s || mkdir -p %s",a_configs_path,a_configs_path);
system(cmd);
+ return 0;
}
+ return -1;
}
/**
@@ -248,7 +250,9 @@ void dap_config_close(dap_config_t * a_config)
*/
int32_t dap_config_get_item_int32(dap_config_t * a_config, const char * a_section_path, const char * a_item_name)
{
-
+ (void)a_config;
+ (void)a_section_path;
+ (void)a_item_name;
return 0;
}
@@ -300,6 +304,9 @@ const char * dap_config_get_item_str_default(dap_config_t * a_config, const char
*/
bool dap_config_get_item_bool(dap_config_t * a_config, const char * a_section_path, const char * a_item_name)
{
+ (void)a_config;
+ (void)a_section_path;
+ (void)a_item_name;
return false;
}
@@ -312,6 +319,9 @@ bool dap_config_get_item_bool(dap_config_t * a_config, const char * a_section_pa
*/
double dap_config_get_item_double(dap_config_t * a_config, const char * a_section_path, const char * a_item_name)
{
+ (void)a_config;
+ (void)a_section_path;
+ (void)a_item_name;
return 0.0;
}
diff --git a/crypto/dap_enc_aes.c b/crypto/dap_enc_aes.c
index 5b839d3..dae80f8 100755
--- a/crypto/dap_enc_aes.c
+++ b/crypto/dap_enc_aes.c
@@ -47,6 +47,7 @@ int test_key_aes(){
void dap_enc_aes_key_delete(struct dap_enc_key *a_key)
{
+ (void)a_key;
//No need any specific actions
}
@@ -57,6 +58,7 @@ void dap_enc_aes_key_delete(struct dap_enc_key *a_key)
*/
void dap_enc_aes_key_new_generate(struct dap_enc_key * a_key,size_t a_size)
{
+ (void)a_size;
uint8_t key[AES_KEYSIZE];
OQS_RAND *rand = OQS_RAND_new(OQS_RAND_alg_urandom_chacha20);
OQS_RAND_n(rand, key, AES_KEYSIZE);
@@ -130,7 +132,7 @@ size_t dap_enc_aes_decode(struct dap_enc_key* a_key, const void * a_in, size_t a
return 0;
OQS_AES128_ECB_dec(a_in,a_in_size,a_key->data,a_out);
int tail = 0;
- for(int i =a_in_size-1; i > a_in_size-15; i--)
+ for(size_t i =a_in_size-1; i > a_in_size-15; i--)
if(*(char*)(a_out + i) == (char)tail_block[i%16])
tail++;
return a_in_size - tail;
diff --git a/crypto/dap_enc_base64.c b/crypto/dap_enc_base64.c
index d5ba199..d71b925 100755
--- a/crypto/dap_enc_base64.c
+++ b/crypto/dap_enc_base64.c
@@ -3,6 +3,7 @@
#include <stdint.h>
#include <ctype.h>
#include <stdlib.h>
+#include <string.h>
#include "dap_enc_base64.h"
@@ -102,7 +103,7 @@ size_t dap_enc_base64_decode(const char * in_raw, size_t in_size,void * out, dap
memcpy(in,in_raw,in_size);
if(standard == DAP_ENC_STANDARD_B64_URLSAFE)
- for(int i=0; i < in_size; i++)
+ for(size_t i=0; i < in_size; i++)
{
if(in[i] == '_')
in[i] = '/';
@@ -254,7 +255,7 @@ size_t dap_enc_base64_encode(const void * a_in, size_t a_in_size, char * a_out,
a_out[size] = '\0';
if(standard == DAP_ENC_STANDARD_B64_URLSAFE)
- for(int i=0; i < size; i++)
+ for(size_t i=0; i < size; i++)
{
if(a_out[i] == '/')
a_out[i] = '_';
diff --git a/crypto/dap_enc_msrln16.c b/crypto/dap_enc_msrln16.c
index afbb586..35299f4 100644
--- a/crypto/dap_enc_msrln16.c
+++ b/crypto/dap_enc_msrln16.c
@@ -5,6 +5,7 @@
#include "liboqs/crypto/rand/rand.h"
#include "liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h"
#include "liboqs/kex/kex.h"
+#include <string.h>
#define LOG_TAG "dap_enc_msrln16"
@@ -42,14 +43,14 @@ size_t bob_key_len;
size_t dap_enc_msrln16_key_new_generate(struct dap_enc_key* a_key, size_t a_size)//(OQS_RAND* rand)
{
+ (void)a_size;
if (a_key == NULL) {
- return NULL;
+ return 0;
}
a_key->_inheritor = (dap_enc_msrln16_key_t*)malloc(sizeof(dap_enc_msrln16_key_t));
a_key->type = DAP_ENC_KEY_TYPE_RLWE_MSRLN16;
- a_key->last_used_timestamp;
a_key->dec=dap_enc_aes_decode;
a_key->enc=dap_enc_aes_encode;
dap_enc_msrln16_key_t *msrln16_a_key = DAP_ENC_KEY_TYPE_RLWE_MSRLN16(a_key);
@@ -68,10 +69,11 @@ size_t dap_enc_msrln16_key_new_generate(struct dap_enc_key* a_key, size_t a_size
* @param key_len
*/
-void dap_enc_msrln16_key_new_from_data(OQS_KEX *k, const void * alice_priv, const uint8_t *bob_msg, const size_t bob_msg_len, uint8_t **key, size_t *key_len)
+void dap_enc_msrln16_key_new_from_data(struct dap_enc_key *a_key, const void *a_in, size_t a_in_size)
{
-
-
+ (void)a_key;
+ (void)a_in;
+ (void)a_in_size;
}
/**
@@ -82,7 +84,9 @@ void dap_enc_msrln16_key_new_from_data(OQS_KEX *k, const void * alice_priv, cons
*/
void dap_enc_msrln16_key_new_from_data_public(dap_enc_key_t * a_key, const void * a_in, size_t a_in_size)
{
-
+ (void)a_key;
+ (void)a_in;
+ (void)a_in_size;
}
/**
@@ -121,7 +125,6 @@ int dap_rlwe_msrln16_alice_1(OQS_KEX *k, const void *alice_priv, const uint8_t *
*/
void dap_enc_msrln16_key_delete(struct dap_enc_key* a_key)
{
- dap_enc_msrln16_key_t* msrln_a_key = DAP_ENC_KEY_TYPE_RLWE_MSRLN16(a_key);
(void) a_key;
if(!a_key){
return;
@@ -136,7 +139,8 @@ void dap_enc_msrln16_key_delete(struct dap_enc_key* a_key)
*/
char* dap_enc_msrln16_key_public_base64(dap_enc_key_t *a_key)
{
-
+ (void)a_key;
+ return NULL;
}
/**
@@ -147,7 +151,9 @@ char* dap_enc_msrln16_key_public_base64(dap_enc_key_t *a_key)
*/
size_t dap_enc_msrln16_key_public_raw(dap_enc_key_t *a_key, void ** a_key_public)
{
-
+ (void)a_key;
+ (void)a_key_public;
+ return NULL;
}
/**
diff --git a/crypto/dap_enc_msrln16.h b/crypto/dap_enc_msrln16.h
index 11b39d2..b77bd41 100644
--- a/crypto/dap_enc_msrln16.h
+++ b/crypto/dap_enc_msrln16.h
@@ -24,7 +24,7 @@ typedef struct dap_enc_msrln16_key{
//dap_enc_key_t* dap_enc_msrln16_key_new_generate(struct dap_enc_key* a_key, size_t a_size);
size_t dap_enc_msrln16_key_new_generate(struct dap_enc_key* a_key, size_t a_size);//(OQS_RAND* rand);
// OQS_KEX_rlwe_msrln16_alice_1
-void dap_enc_msrln16_key_new_from_data(OQS_KEX *k, const void *alice_priv, const uint8_t *bob_msg, const size_t bob_msg_len, uint8_t **key, size_t *key_len);
+void dap_enc_msrln16_key_new_from_data(struct dap_enc_key *a_key, const void *a_in, size_t a_in_size);
//void dap_enc_msrln16_key_new_from_data(dap_enc_key_t * a_key, const void * a_in, size_t a_in_size);
void dap_enc_msrln16_key_new_from_data_public(dap_enc_key_t* a_key, const void * a_in, size_t a_in_size);
diff --git a/crypto/dap_enc_newhope.c b/crypto/dap_enc_newhope.c
index 30856c5..7177a35 100644
--- a/crypto/dap_enc_newhope.c
+++ b/crypto/dap_enc_newhope.c
@@ -10,7 +10,8 @@
*/
void dap_enc_newhope_key_new_generate(dap_enc_key_t * a_key, size_t a_size)
{
-
+ (void)a_key;
+ (void)a_size;
}
/**
@@ -21,7 +22,9 @@ void dap_enc_newhope_key_new_generate(dap_enc_key_t * a_key, size_t a_size)
*/
void dap_enc_newhope_key_new_from_data(dap_enc_key_t * a_key, const void * a_in, size_t a_in_size)
{
-
+ (void)a_key;
+ (void)a_in;
+ (void)a_in_size;
}
/**
@@ -32,7 +35,9 @@ void dap_enc_newhope_key_new_from_data(dap_enc_key_t * a_key, const void * a_in,
*/
void dap_enc_newhope_key_new_from_data_public(dap_enc_key_t * a_key, const void * a_in, size_t a_in_size)
{
-
+ (void)a_key;
+ (void)a_in;
+ (void)a_in_size;
}
/**
@@ -41,7 +46,7 @@ void dap_enc_newhope_key_new_from_data_public(dap_enc_key_t * a_key, const void
*/
void dap_enc_newhope_key_delete(dap_enc_key_t *a_key)
{
-
+ (void)a_key;
}
/**
@@ -51,7 +56,8 @@ void dap_enc_newhope_key_delete(dap_enc_key_t *a_key)
*/
char* dap_enc_newhope_key_public_base64(dap_enc_key_t *a_key)
{
-
+ (void)a_key;
+ return NULL;
}
/**
@@ -62,7 +68,9 @@ char* dap_enc_newhope_key_public_base64(dap_enc_key_t *a_key)
*/
size_t dap_enc_newhope_key_public_raw(dap_enc_key_t *a_key, void ** a_key_public)
{
-
+ (void)a_key;
+ (void)a_key_public;
+ return 0;
}
/**
@@ -75,7 +83,11 @@ size_t dap_enc_newhope_key_public_raw(dap_enc_key_t *a_key, void ** a_key_public
*/
size_t dap_enc_newhope_decode(dap_enc_key_t* a_key, const void * a_in, size_t a_in_size,void * a_out)
{
-
+ (void)a_key;
+ (void)a_in;
+ (void)a_in_size;
+ (void)a_out;
+ return 0;
}
/**
@@ -88,5 +100,9 @@ size_t dap_enc_newhope_decode(dap_enc_key_t* a_key, const void * a_in, size_t a_
*/
size_t dap_enc_newhope_encode(dap_enc_key_t* a_key, const void * a_in, size_t a_in_size,void * a_out)
{
-
+ (void)a_key;
+ (void)a_in;
+ (void)a_in_size;
+ (void)a_out;
+ return 0;
}
diff --git a/crypto/dap_enc_sidh16.c b/crypto/dap_enc_sidh16.c
index 4c7b475..9aaba07 100644
--- a/crypto/dap_enc_sidh16.c
+++ b/crypto/dap_enc_sidh16.c
@@ -31,44 +31,37 @@ void test(){
extern bool dap_sidh16_CurveIsogenyStruct_isnull(PCurveIsogenyStruct pCurveIsogeny);
-dap_enc_key_t *dap_enc_sidh16_key_new_generate(struct dap_enc_key *a_key, size_t a_size) {
- dap_enc_key_t *k = DAP_NEW(dap_enc_key_t);
- dap_enc_sidh16_key_t *sidh_a_key = DAP_ENC_SIDH16_KEY(a_key);
- if(k == NULL)
- return NULL;
+void dap_enc_sidh16_key_new_generate(struct dap_enc_key *a_key, size_t a_size) {
+ (void)a_size;
+ a_key = DAP_NEW(dap_enc_key_t);
+ if(a_key == NULL)
+ return;
// Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ ÑиÑтемы изогенных кривых
PCurveIsogenyStruct curveIsogeny = oqs_sidh_cln16_curve_allocate(&CurveIsogeny_SIDHp751);
if(curveIsogeny == NULL /*|| dap_sidh16_CurveIsogenyStruct_isnull(curveIsogeny)*/) {
- DAP_DELETE(k);
+ DAP_DELETE(a_key);
// оÑвобождаем памÑÑ‚ÑŒ Ð´Ð»Ñ Ð¸Ð·Ð¾Ð³ÐµÐ½Ð¸Ð¸
oqs_sidh_cln16_curve_free(curveIsogeny);
- return NULL;
+ return;
}
// Инициализировать изогенную Ñтруктуру кривой pCurveIsogeny Ñо ÑтатичеÑкими данными, извлеченными из pCurveIsogenyData.
// Ðто нужно вызвать поÑле Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¼Ñти Ð´Ð»Ñ pCurveIsogeny Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ SIDH_curve_allocate()
if(oqs_sidh_cln16_curve_initialize(curveIsogeny, &CurveIsogeny_SIDHp751) != SIDH_CRYPTO_SUCCESS) {
- DAP_DELETE(k);
+ DAP_DELETE(a_key);
oqs_sidh_cln16_curve_free(curveIsogeny);
- return NULL;
+ return;
}
- k->data;
- k->data_size;
- k->type = DAP_ENC_KEY_TYPE_SIDH_CLN16;
- k->last_used_timestamp;
- k->enc = &dap_enc_sidh16_encode;
- k->dec = &dap_enc_sidh16_decode;
- k->delete_callback = &dap_enc_sidh16_key_delete;
-
- sidh_a_key->rand;
- sidh_a_key->user_curveIsogeny;
- return k;
-
+ a_key->type = DAP_ENC_KEY_TYPE_SIDH_CLN16;
+ a_key->enc = &dap_enc_sidh16_encode;
+ a_key->dec = &dap_enc_sidh16_decode;
+ a_key->delete_callback = &dap_enc_sidh16_key_delete;
}
void dap_enc_sidh16_key_new_from_data(struct dap_enc_key *a_key, const void *a_in, size_t a_in_size) {
-
-
+ (void)a_key;
+ (void)a_in;
+ (void)a_in_size;
}
void dap_enc_sidh16_key_delete(struct dap_enc_key *a_key) {
@@ -147,6 +140,7 @@ size_t dap_enc_sidh16_encode(struct dap_enc_key *a_key, const void *a_in, size_t
// int OQS_KEX_sidh_cln16_bob(OQS_KEX *k, const uint8_t *alice_msg, const size_t alice_msg_len, uint8_t **bob_msg, size_t *bob_msg_len, uint8_t **key, size_t *key_len)
size_t dap_enc_sidh16_decode(struct dap_enc_key *a_key, const void *a_in, size_t a_in_size, void *a_out) {
+ (void)a_in_size;
size_t ret;
dap_enc_sidh16_key_t *sidh_a_key = DAP_ENC_SIDH16_KEY(a_key);
uint8_t *bob_priv = NULL;
diff --git a/crypto/dap_enc_sidh16.h b/crypto/dap_enc_sidh16.h
index 46e70c8..073038e 100644
--- a/crypto/dap_enc_sidh16.h
+++ b/crypto/dap_enc_sidh16.h
@@ -41,7 +41,7 @@ struct dapenc_testcase {
#define DAP_ENC_SIDH16_KEY(a) ((dap_enc_sidh16_key_t *)((a)->_inheritor))
-dap_enc_key_t *dap_enc_sidh16_key_new_generate(struct dap_enc_key* a_key, size_t a_size); // new
+void dap_enc_sidh16_key_new_generate(struct dap_enc_key* a_key, size_t a_size); // new
void dap_enc_sidh16_key_new_from_data(struct dap_enc_key* a_key, const void* a_in, size_t a_in_size); // alice_1
void dap_enc_sidh16_key_delete(struct dap_enc_key* a_key); // sidh_cln16_alice_priv_free // sidh_cln16_free
diff --git a/crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.c b/crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.c
index 5151901..0041df1 100644
--- a/crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.c
+++ b/crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.c
@@ -65,7 +65,7 @@ OQS_KEX *OQS_KEX_sidh_cln16_new(OQS_RAND *rand, const char *named_parameters) {
k->estimated_quantum_security = 128;
k->seed = NULL;
k->seed_len = 0;
- k->named_parameters = compressed ? CompressedP751 : P751;
+ k->named_parameters = compressed ? (char*)CompressedP751 : (char*)P751;
k->rand = rand;
k->params = NULL;
k->alice_0 = &OQS_KEX_sidh_cln16_alice_0;
diff --git a/http/dap_http_client.c b/http/dap_http_client.c
index 329ad07..b2955e8 100644
--- a/http/dap_http_client.c
+++ b/http/dap_http_client.c
@@ -150,6 +150,8 @@ bool dap_http_request_line_parse(dap_http_client_t * cl_ht, char * buf, size_t b
p_st=PS_TYPE;
pos_kw_begin=pos+1;
}break;
+ default:
+ break;
}
}else{
switch(p_st){
@@ -157,6 +159,7 @@ bool dap_http_request_line_parse(dap_http_client_t * cl_ht, char * buf, size_t b
p_st=PS_ACTION;
pos_kw_begin=pos;
};break;
+ default:break;
}
}
}
@@ -205,16 +208,18 @@ cnt:switch(cl_ht->state_read){
}
}
//log_it(NOTICE, "Input: %s request for %s document (query string '%s')",cl_ht->action,cl_ht->url_path, cl_ht->in_query_string? cl_ht->in_query_string: "");
- char * d_name, *b_name;
+ char *b_name;
char * url_cpy1, *url_cpy2;
url_cpy1=strdup(cl_ht->url_path);
url_cpy2=strdup(cl_ht->url_path);
- d_name=dirname(url_cpy1);
+
b_name=basename(url_cpy2);
strncpy(cl_ht->url_path,b_name,sizeof(cl_ht->url_path));
#ifdef DAP_SERVER
+ char * d_name;
+ d_name=dirname(url_cpy1);
dap_http_url_proc_t * url_proc;
HASH_FIND_STR(cl_ht->http->url_proc, d_name , url_proc); // Find URL processor
@@ -313,8 +318,9 @@ cnt:switch(cl_ht->state_read){
}break;
case DAP_HTTP_CLIENT_STATE_DATA:{//Read the data
// log_it(L_WARNINGNG, "DBG_#002 [%s] [%s]", cl_ht->in_query_string, cl_ht->url_path);
- int read_bytes=0;
+
#ifdef DAP_SERVER
+ int read_bytes=0;
if(cl_ht->proc->data_read_callback){
//while(cl_ht->client->buf_in_size){
cl_ht->proc->data_read_callback(cl_ht,&read_bytes);
@@ -432,8 +438,8 @@ void dap_http_client_out_header_generate(dap_http_client_t *cl_ht)
void dap_http_client_error(struct dap_client_remote * cl,void * arg)
{
(void) arg;
- dap_http_client_t * cl_ht=DAP_HTTP_CLIENT(cl);
#ifdef DAP_SERVER
+ dap_http_client_t * cl_ht=DAP_HTTP_CLIENT(cl);
if(cl_ht->proc)
if(cl_ht->proc->error_callback)
cl_ht->proc->error_callback(cl_ht,arg);
diff --git a/http/dap_http_client_simple.c b/http/dap_http_client_simple.c
index 13ead27..643e818 100644
--- a/http/dap_http_client_simple.c
+++ b/http/dap_http_client_simple.c
@@ -53,7 +53,6 @@ int dap_http_client_simple_init()
{
curl_global_init(CURL_GLOBAL_ALL);
m_curl_mh = curl_multi_init();
- void* arg;
pthread_create(&curl_pid,NULL,dap_http_client_thread,NULL );
return 0;
}
--
GitLab