From e15e2a39c99eb94d96d979c668e2dade105d05ab Mon Sep 17 00:00:00 2001
From: Alexey Stratulat <alexey.stratulat@demlabs.net>
Date: Wed, 18 Sep 2019 14:40:19 +0700
Subject: [PATCH] [*] Fixed wrapping key removal functions.
---
include/wrapping_dap_enc_key.h | 1 -
src/wrapping_dap_enc_iaes.c | 7 +------
src/wrapping_dap_enc_key.c | 17 -----------------
src/wrapping_dap_enc_oaes.c | 7 +------
4 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/include/wrapping_dap_enc_key.h b/include/wrapping_dap_enc_key.h
index e1ea507e..079c6d66 100644
--- a/include/wrapping_dap_enc_key.h
+++ b/include/wrapping_dap_enc_key.h
@@ -37,7 +37,6 @@ PyObject *dap_enc_gen_key_public_size_py(PyObject *self, PyObject *args);//dap_e
PyObject *dap_enc_gen_key_public_py(PyObject *self, PyObject *args);//dap_enc_key_t *a_key, void * a_output); ->int
PyObject *dap_enc_key_signature_delete_py(PyObject *self, PyObject *args);//dap_enc_key_type_t a_key_type, uint8_t *a_sig_buf); ->void
-PyObject *dap_enc_key_delete_py(PyObject *self, PyObject *args);//dap_enc_key_t * a_key); ->void
#ifdef __cplusplus
diff --git a/src/wrapping_dap_enc_iaes.c b/src/wrapping_dap_enc_iaes.c
index 77307794..c8433a54 100644
--- a/src/wrapping_dap_enc_iaes.c
+++ b/src/wrapping_dap_enc_iaes.c
@@ -18,12 +18,7 @@ PyObject* dap_enc_iaes_key_delete_py(PyObject *self, PyObject *args){
if (PyArg_ParseTuple(args, "O", &obj_key)){
return NULL;
}
-// dap_enc_key_t *key = key_list_get_key(keys_iaes, key_id);
-// if (key == NULL){
-// return NULL;
-// }
-// dap_enc_key_delete(((PyCryptoKeyObject*)obj_key)->key);
- PyObject_Del(obj_key);
+ dap_enc_aes_key_delete(((PyCryptoKeyObject*)obj_key)->key);
return PyLong_FromLong(0);
}
diff --git a/src/wrapping_dap_enc_key.c b/src/wrapping_dap_enc_key.c
index 01356fe9..6779ad27 100644
--- a/src/wrapping_dap_enc_key.c
+++ b/src/wrapping_dap_enc_key.c
@@ -132,20 +132,3 @@ PyObject *dap_enc_key_signature_delete_py(PyObject *self, PyObject *args){
dap_enc_key_signature_delete(type_key, a_sig_buf);
return PyLong_FromLong(0);
}
-
-PyObject *dap_enc_key_delete_py(PyObject *self, PyObject *args){
- //PyObject *obj;
- PyObject *in_key;
- if (!PyArg_ParseTuple(args, "O", &in_key)){
- return NULL;
- }
-// dap_enc_key_t *key = key_list_get_key(keys, key_id);
-// if (key == NULL) {
-// return NULL;
-// }
-// key_list_del_element(keys, key_id);
-// dap_enc_key_delete(((PyCryptoKeyObject*)in_key)->key);
-// PyObject_Del(in_key);
-// PyCryptoKeyObject_dealloc((PyCryptoKeyObject*)in_key);
- return PyLong_FromLong(0);
-}
diff --git a/src/wrapping_dap_enc_oaes.c b/src/wrapping_dap_enc_oaes.c
index 36b47fa1..bf7aa9e6 100644
--- a/src/wrapping_dap_enc_oaes.c
+++ b/src/wrapping_dap_enc_oaes.c
@@ -18,12 +18,7 @@ PyObject *dap_enc_oaes_key_delete_py(PyObject *self, PyObject *args){
if (PyArg_ParseTuple(args, "O", &in_key)){
return NULL;
}
-// dap_enc_key_t *key = key_list_get_key(keys_oaes, key_id);
-// if (key == NULL){
-// return NULL;
-// }
- dap_enc_key_delete(((PyCryptoKeyObject*)in_key)->key);
- PyObject_Del(in_key);
+ dap_enc_oaes_key_delete(((PyCryptoKeyObject*)in_key)->key);
return PyLong_FromLong(0);
}
PyObject *dap_enc_oaes_key_generate_py(PyObject *self, PyObject *args){
--
GitLab