From 6c43a84dc81e0bd20d95cb4d1541b6bcd3733d2d Mon Sep 17 00:00:00 2001
From: Maxim Krasylnikov <maxim.krasylnikov@demlabs.net>
Date: Thu, 19 Apr 2018 16:28:41 +0600
Subject: [PATCH] callbackdonotmatchproblemsolved
---
crypto/dap_enc_msrln16.c | 27 +++++++++++++++++++++++----
crypto/dap_enc_msrln16.h | 2 +-
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/crypto/dap_enc_msrln16.c b/crypto/dap_enc_msrln16.c
index a346c1fc87..c3850af31f 100644
--- a/crypto/dap_enc_msrln16.c
+++ b/crypto/dap_enc_msrln16.c
@@ -152,13 +152,32 @@ void dap_enc_msrln16_key_new_from_data_public(dap_enc_key_t * a_key, const void
*/
void dap_enc_msrln16_key_delete(struct dap_enc_key* a_key)
{
+ //dap_enc_sidh16_key_t *sidh_a_key = DAP_ENC_SIDH16_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;
+ }
+ /* oqs_sidh_cln16_curve_free((PCurveIsogenyStruct)sidh_a_key->user_curveIsogeny);
+ sidh_a_key->user_curveIsogeny = NULL;*/
+ DAP_DELETE(a_key);
// free();
- free(alice_msg);
+ /*free(alice_msg);
free(alice_key);
free(bob_msg);
- free(bob_key);
- OQS_KEX_rlwe_msrln16_alice_priv_free(kex, alignce_priv);
- OQS_KEX_rlwe_msrln16_free(kex);
+ free(bob_key);*/
+ /*if (alice_priv) {*/
+ //free(alice_priv);
+ /*}*/
+ //OQS_KEX k = a_key->
+// if (!k) {
+// return;
+// }
+// free(k->method_name);
+// k->method_name = NULL;
+// free(k);
+// /*OQS_KEX_rlwe_msrln16_alice_priv_free(kex, alignce_priv);
+ /* OQS_KEX_rlwe_msrln16_free(kex);*/
}
/**
diff --git a/crypto/dap_enc_msrln16.h b/crypto/dap_enc_msrln16.h
index 0dac8ec830..94a9adaca8 100644
--- a/crypto/dap_enc_msrln16.h
+++ b/crypto/dap_enc_msrln16.h
@@ -24,7 +24,7 @@ typedef struct dap_enc_msrln16_key{
//void dap_enc_msrln16_key_new_generate(OQS_RAND *rand);
//dap_enc_key_t* dap_enc_msrln16_key_new_generate(struct dap_enc_key* a_key, size_t a_size);
-dap_enc_key_t* dap_enc_msrln16_key_new_genrate(struct dap_enc_key* a_key, size_t a_size);//(OQS_RAND* rand);
+dap_enc_key_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(dap_enc_key_t * a_key, const void * a_in, size_t a_in_size);
--
GitLab