From c0943b21991070118bbdd3147926dbc1ff8123d1 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <dm@cifercom.com>
Date: Tue, 9 Jan 2018 14:27:18 +0700
Subject: [PATCH] [-] Old RSA generator [+] New enc_key declarations
---
crypt/dap_enc_key.c | 35 +++++++++++++++--------------------
crypt/dap_enc_key.h | 2 ++
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/crypt/dap_enc_key.c b/crypt/dap_enc_key.c
index 897b5a7369..13563c08e5 100644
--- a/crypt/dap_enc_key.c
+++ b/crypt/dap_enc_key.c
@@ -29,7 +29,7 @@
#define LOG_TAG "dap_enc_key"
struct dap_enc_key_callbacks{
- const char * name,
+ const char * name;
dap_enc_callback_dataop_t enc;
dap_enc_callback_dataop_t dec;
dap_enc_callback_data_t new_from_callback;
@@ -37,7 +37,7 @@ struct dap_enc_key_callbacks{
dap_enc_callback_t delete_callback;
} s_callbacks[]={
[DAP_ENC_KEY_TYPE_AES]={
- .name = "AES"
+ .name = "AES",
.enc = dap_enc_aes_encode,
.dec = dap_enc_aes_decode,
.new_generate_callback = dap_enc_aes_key_new_generate,
@@ -81,6 +81,16 @@ void dap_enc_key_deinit()
}
+/**
+ * @brief dap_enc_key_new
+ * @param key_type
+ * @return
+ */
+dap_enc_key_t *dap_enc_key_new(dap_enc_key_type_t key_type)
+{
+
+}
+
/**
* @brief dap_enc_key_new_generate
* @param key_type
@@ -89,24 +99,9 @@ void dap_enc_key_deinit()
*/
dap_enc_key_t *dap_enc_key_new_generate(dap_enc_key_type_t key_type, size_t key_size)
{
- if(s_callbacks[key_type] )
- switch (v_type) {
- case ENC_KEY_TYPE_RSA: {
- if(key_session_pair == NULL)
- {
- log_it(WARNING, "Error generate enc key, key session pair is NULL");
- return NULL;
- }
- enc_key_t *key = (enc_key_t*)malloc(sizeof(enc_key_t));
- key->enc = (enc_callback_t) enc_rsa_encode;
- key->dec = enc_rsa_decode;
- key->internal = (void*) key_session_pair;
- key->type = ENC_KEY_TYPE_RSA;
- return key;
- }
- break;
- default:
- break;
+ if(s_callbacks[key_type].name ){
+ dap_enc_key_t * ret = dap_enc_ke_n
+ s_callbacks[key_type].new_generate_callback()
}
return NULL;
}
diff --git a/crypt/dap_enc_key.h b/crypt/dap_enc_key.h
index 2317701c48..8b111abd26 100644
--- a/crypt/dap_enc_key.h
+++ b/crypt/dap_enc_key.h
@@ -104,6 +104,8 @@ typedef struct dap_enc_key{
int dap_enc_key_init();
void dap_enc_key_deinit();
+dap_enc_key_t *dap_enc_key_new(dap_enc_key_type_t key_type);
+
dap_enc_key_t *dap_enc_key_new_generate(dap_enc_key_type_t key_type, size_t key_size);
dap_enc_key_t *dap_enc_key_new_from_data(dap_enc_key_type_t a_type, void * a_key_input, size_t a_key_input_size);
dap_enc_key_t *dap_enc_key_new_from_str(dap_enc_key_type_t a_type, const char *a_key_str);
--
GitLab