From eaada407c8dfd3dfdf034114cfddf0808f236a3a Mon Sep 17 00:00:00 2001
From: Maxim Krasylnikov <maxim.krasylnikov@demlabs.net>
Date: Thu, 5 Apr 2018 18:34:28 +0600
Subject: [PATCH] enccommit1

---
 crypto/CMakeLists.txt                         |  4 +-
 crypto/dap_enc.c                              |  9 ++
 crypto/dap_enc_key.c                          | 16 +++-
 crypto/dap_enc_key.h                          |  1 +
 crypto/dap_enc_msrln16.c                      | 94 +++++++++++++++++++
 crypto/dap_enc_msrln16.h                      | 19 ++++
 crypto/liboqs/kex/kex.h                       |  6 +-
 .../kex_rlwe_msrln16/kex_rlwe_msrln16.h       |  8 +-
 8 files changed, 150 insertions(+), 7 deletions(-)
 create mode 100644 crypto/dap_enc_msrln16.c
 create mode 100644 crypto/dap_enc_msrln16.h

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 6e6834468e..4a890d66a1 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CRYPTO_SRCS
         dap_enc_base64.c
         dap_enc_aes.c
         dap_enc_newhope.c
-
+        dap_enc_msrln16.c
         dap_enc_key.c
     )
 
@@ -15,7 +15,7 @@ set(CRYPTO_HEADERS
     dap_enc_base64.h
     dap_enc_aes.h
     dap_enc_newhope.h
-
+    dap_enc_msrln16.h
     dap_enc_key.h
 
     )
diff --git a/crypto/dap_enc.c b/crypto/dap_enc.c
index 9ac3ebd3e9..089c2ae72f 100644
--- a/crypto/dap_enc.c
+++ b/crypto/dap_enc.c
@@ -29,6 +29,7 @@
 #include "dap_enc_base64.h"
 #include "dap_enc_key.h"
 #include "dap_common.h"
+#include "dap_enc_msrln16.h"
 
 #define LOG_TAG "dap_enc"
 
@@ -72,6 +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:{
+                //надо посмотреть алгоритм
+            }
+            break;
         }
         size_t ret=key->enc(key,buf,buf_size,proc_buf);
         if(data_type_out==DAP_ENC_DATA_TYPE_B64){
@@ -109,6 +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:{
+            //надобно алгоритм смотреть штолЕ?!
+        }
+        break;
     }
 
     if(key->dec){
diff --git a/crypto/dap_enc_key.c b/crypto/dap_enc_key.c
index 498cf8b17b..a52d115122 100644
--- a/crypto/dap_enc_key.c
+++ b/crypto/dap_enc_key.c
@@ -25,6 +25,7 @@
 
 #include "dap_enc_aes.h"
 #include "dap_enc_newhope.h"
+#include "dap_enc_msrln16.h"
 
 #include "dap_enc_key.h"
 
@@ -67,7 +68,20 @@ struct dap_enc_key_callbacks{
                             .new_from_data_callback = dap_enc_newhope_key_new_from_data,
                             .key_public_raw_callback = dap_enc_newhope_key_public_raw,
                             .new_from_data_public_callback = dap_enc_newhope_key_new_from_data_public
-                           }
+                           },
+    //MSRLN16
+    [DAP_ENC_KEY_TYPE_RLWE_MSRLN16] = {
+                            .name = "MSRLN16",
+                            .size_max = 64,
+                            .enc = dap_enc_msrln16_encode,
+                            .dec = dap_enc_msrln16_decode,
+                            .new_callback = NULL,
+                            .delete_callback =NULL,
+                            .new_generate_callback = dap_enc_msrln16_key_new_generate,
+                            .new_from_data_callback = dap_enc_msrln16_key_new_from_data,
+                            .key_public_raw_callback = dap_enc_msrln16_key_public_raw,
+                            .new_from_data_public_callback = dap_enc_msrln16_key_new_from_data_public
+    }
 };
 
 const size_t c_callbacks_size = sizeof(s_callbacks) / sizeof(s_callbacks[0]);
diff --git a/crypto/dap_enc_key.h b/crypto/dap_enc_key.h
index 1ab9e2cdde..a409fcc74b 100644
--- a/crypto/dap_enc_key.h
+++ b/crypto/dap_enc_key.h
@@ -25,6 +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_t;
 
 typedef enum dap_enc_key_type{ DAP_ENC_KEY_TYPE_AES, // Symmetric AES
diff --git a/crypto/dap_enc_msrln16.c b/crypto/dap_enc_msrln16.c
new file mode 100644
index 0000000000..f9f8342465
--- /dev/null
+++ b/crypto/dap_enc_msrln16.c
@@ -0,0 +1,94 @@
+#include "dap_common.h"
+#include "dap_enc_msrln16.h"
+
+#include "liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h"
+
+#define LOG_TAG "dap_enc_msrln16"
+
+/**
+ * @brief dap_enc_msrln16_key_new_generate
+ * @param a_key
+ * @param a_size
+ */
+void dap_enc_msrln16_key_new_generate(dap_enc_key_t * a_key, size_t a_size)
+{
+
+}
+
+/**
+ * @brief dap_enc_msrln16_key_new_from_data
+ * @param a_key
+ * @param a_in
+ * @param 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)
+{
+
+}
+
+/**
+ * @brief dap_enc_msrln16_key_new_from_data_public
+ * @param a_key
+ * @param a_in
+ * @param 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)
+{
+
+}
+
+/**
+ * @brief dap_enc_msrln16_key_delete
+ * @param a_key
+ */
+void dap_enc_msrln16_key_delete(dap_enc_key_t *a_key)
+{
+
+}
+
+/**
+ * @brief dap_enc_msrln16_key_public_base64
+ * @param a_key
+ * @return
+ */
+char* dap_enc_msrln16_key_public_base64(dap_enc_key_t *a_key)
+{
+
+}
+
+/**
+ * @brief dap_enc_msrln16_key_public_raw
+ * @param a_key
+ * @param a_key_public
+ * @return
+ */
+size_t dap_enc_msrln16_key_public_raw(dap_enc_key_t *a_key, void ** a_key_public)
+{
+
+}
+
+/**
+ * @brief dap_enc_msrln16_decode
+ * @param a_key
+ * @param a_in
+ * @param a_in_size
+ * @param a_out
+ * @return
+ */
+size_t dap_enc_msrln16_decode(dap_enc_key_t* a_key, const void * a_in, size_t a_in_size,void * a_out)
+{
+
+}
+
+/**
+ * @brief dap_enc_msrln16_encode
+ * @param a_key
+ * @param a_in
+ * @param a_in_size
+ * @param a_out
+ * @return
+ */
+size_t dap_enc_msrln16_encode(dap_enc_key_t* a_key, const void * a_in, size_t a_in_size,void * a_out)
+{
+
+}
diff --git a/crypto/dap_enc_msrln16.h b/crypto/dap_enc_msrln16.h
new file mode 100644
index 0000000000..a694505eb2
--- /dev/null
+++ b/crypto/dap_enc_msrln16.h
@@ -0,0 +1,19 @@
+#ifndef _DAP_ENC_MSRLN16_H_
+#define _DAP_ENC_MSRLN16_H_
+
+#include <stddef.h>
+
+typedef struct dap_enc_key dap_enc_key_t;
+
+void dap_enc_msrln16_key_new_generate(dap_enc_key_t * a_key, size_t a_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);
+
+void dap_enc_msrln16_key_delete(dap_enc_key_t *a_key);
+
+size_t dap_enc_msrln16_key_public_raw(dap_enc_key_t *a_key, void ** a_key_public);
+
+size_t dap_enc_msrln16_decode(dap_enc_key_t* a_key, const void * a_in, size_t a_in_size,void * a_out);
+size_t dap_enc_msrln16_encode(dap_enc_key_t* a_key, const void * a_in, size_t a_in_size,void * a_out);
+
+#endif
diff --git a/crypto/liboqs/kex/kex.h b/crypto/liboqs/kex/kex.h
index 0decdf874b..02ab71edb4 100644
--- a/crypto/liboqs/kex/kex.h
+++ b/crypto/liboqs/kex/kex.h
@@ -9,10 +9,12 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <oqs/rand.h>
+//#include <oqs/rand.h> //беда с симлинками, посему так пока
+#include "../crypto/rand/rand.h"
 
 #if !defined(WINDOWS)
-#include <oqs/config.h>
+#include "../config.h"
+//#include <oqs/config.h>
 #endif
 
 enum OQS_KEX_alg_name {
diff --git a/crypto/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h b/crypto/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h
index ad1ee4f520..77613a42e9 100644
--- a/crypto/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h
+++ b/crypto/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h
@@ -9,8 +9,12 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <oqs/kex.h>
-#include <oqs/rand.h>
+#include "../kex/kex.h"
+#include "../crypto/rand/rand.h"
+//с симлинком беда какая-то, поэтому так пока
+
+/*#include <oqs/kex.h>
+#include <oqs/rand.h>*/
 
 OQS_KEX *OQS_KEX_rlwe_msrln16_new(OQS_RAND *rand);
 
-- 
GitLab