diff --git a/include/wrapping_dap_enc_key.h b/include/wrapping_dap_enc_key.h index e1ea507e74feb476703dcc1fa9797fc98ade9421..079c6d66c8efc74d5c66abb2decf26b978ac7c5f 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 773077945e28627fcd57be8bc9c6500e54f52037..c8433a5437d9f37b0b3c1576531cc960559f0600 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 01356fe995851df44e70c78640f866ce6525abbb..6779ad279c804dd9c97b189f99aa196675bd3463 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 36b47fa1a0e36cb4a269906e2e883106fac7624d..bf7aa9e61696f5492ba161e3e4fa14a451687621 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){