From d5b6cc28ac0cf8d116aba84280cf92d6ea9cff31 Mon Sep 17 00:00:00 2001 From: Maxim Krasylnikov <maxim.krasylnikov@demlabs.net> Date: Fri, 6 Apr 2018 19:46:39 +0600 Subject: [PATCH] fixedcommit1 --- crypto/CMakeLists.txt | 5 +++++ crypto/dap_enc.c | 8 ++++---- crypto/dap_enc_key.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 4a890d66a1..a4c45f676e 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -10,6 +10,10 @@ set(CRYPTO_SRCS dap_enc_key.c ) +set(RND_SRCS + libdap/crypto/liboqs/crypto/rand/rand.c + ) + set(CRYPTO_HEADERS dap_enc.h dap_enc_base64.h @@ -18,6 +22,7 @@ set(CRYPTO_HEADERS dap_enc_msrln16.h dap_enc_key.h + ) diff --git a/crypto/dap_enc.c b/crypto/dap_enc.c index 089c2ae72f..14e1a94ab1 100644 --- a/crypto/dap_enc.c +++ b/crypto/dap_enc.c @@ -73,10 +73,10 @@ size_t dap_enc_code(struct dap_enc_key * key,const void * buf,const size_t buf_s case DAP_ENC_DATA_TYPE_RAW:{ proc_buf=buf_out; }break; - case DAP_ENC_DATA_TYPE_RLWE_MSRLN16:{ +/* case DAP_ENC_DATA_TYPE_RLWE_MSRLN16:{ //надо поÑмотреть алгоритм } - break; + break;*/ } size_t ret=key->enc(key,buf,buf_size,proc_buf); if(data_type_out==DAP_ENC_DATA_TYPE_B64){ @@ -114,10 +114,10 @@ size_t dap_enc_decode(struct dap_enc_key * key,const void * buf, const size_t bu proc_buf_const=buf; proc_buf_size=buf_size; }break; - case DAP_ENC_DATA_TYPE_RLWE_MSRLN16:{ +/* case DAP_ENC_DATA_TYPE_RLWE_MSRLN16:{ //надобно алгоритм Ñмотреть штолЕ?! } - break; + break;*/ } if(key->dec){ diff --git a/crypto/dap_enc_key.h b/crypto/dap_enc_key.h index a409fcc74b..d82cf3df9f 100644 --- a/crypto/dap_enc_key.h +++ b/crypto/dap_enc_key.h @@ -25,7 +25,7 @@ #include <time.h> typedef enum dap_enc_data_type{DAP_ENC_DATA_TYPE_RAW, DAP_ENC_DATA_TYPE_B64, - DAP_ENC_DATA_TYPE_RLWE_MSRLN16//а оно мне надо? + //DAP_ENC_DATA_TYPE_RLWE_MSRLN16//а оно мне надо? } dap_enc_data_type_t; typedef enum dap_enc_key_type{ DAP_ENC_KEY_TYPE_AES, // Symmetric AES -- GitLab