From edf552ae1a7eeb22bcc4773420c03883ea78909c Mon Sep 17 00:00:00 2001
From: Alexey Stratulat <alexey.stratulat@demlabs.net>
Date: Mon, 15 Jul 2019 17:25:57 +0700
Subject: [PATCH] [+] Added wrapping functions: dap_enc_key_get_enc_sizey,
dap_enc_key_get_dec_size, dap_enc_key_update, dap_enc_gen_key_public_size,
dap_enc_gen_key_public, dap_enc_key_signature_delete.
---
include/wrapping_dap_enc_key.h | 6 +--
src/wrapping_dap_enc_key.c | 85 +++++++++++++++++++++++++++++++---
2 files changed, 80 insertions(+), 11 deletions(-)
diff --git a/include/wrapping_dap_enc_key.h b/include/wrapping_dap_enc_key.h
index 6bc80252..824f99d7 100644
--- a/include/wrapping_dap_enc_key.h
+++ b/include/wrapping_dap_enc_key.h
@@ -32,8 +32,4 @@ 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
-
-//void init_wrapping_dap_enc_key();
-
-//dap_enc_key_t* get_dap_enc_key(PyBytesObject *object);
\ No newline at end of file
+PyObject *dap_enc_key_delete_py(PyObject *self, PyObject *args);//dap_enc_key_t * a_key); ->void
\ No newline at end of file
diff --git a/src/wrapping_dap_enc_key.c b/src/wrapping_dap_enc_key.c
index 929a59b8..a07892a4 100644
--- a/src/wrapping_dap_enc_key.c
+++ b/src/wrapping_dap_enc_key.c
@@ -1,10 +1,33 @@
#include "wrapping_dap_enc_key.h"
PyObject* dap_enc_key_get_enc_size_py(PyObject *self, PyObject *args){
- return PyLong_FromLong(0);
+ uint8_t key_id;
+ size_t buff_in_size;
+ if (!PyArg_ParseTuple(args, "h|i"), &key_id, &buff_in_size){
+ return NULL;
+ }
+ dap_enc_key_t *key = key_list_get_key(keys, key_id);
+ if (key == NULL)
+ return NULL;
+ size_t size_buff = dap_enc_key_get_enc_size(key, buff_in_size);
+ if (size_buff == 0)
+ return NULL;
+ return PyLong_FromSize_t(size_buff);
}
+
PyObject* dap_enc_key_get_dec_size_py(PyObject *self, PyObject *args){
- return PyLong_FromLong(0);
+ uint8_t key_id;
+ size_t buff_in_size;
+ if (!PyArg_ParseTuple(args, "h|i"), &key_id, &buff_in_size){
+ return NULL;
+ }
+ dap_enc_key_t *key = key_list_get_key(keys, key_id);
+ if (key == NULL)
+ return NULL;
+ size_t size_buff = dap_enc_key_get_dec_size(key, buff_in_size);
+ if (size_buff == 0)
+ return NULL;
+ return PyLong_FromSize_t(size_buff);
}
// allocate memory for key struct
@@ -22,29 +45,79 @@ PyObject* dap_enc_key_new_py(PyObject *self, PyObject *args){
}
/// default gen key
-PyObject *dap_enc_key_new_generate_py(PyObject *self, PyObject *args){
+PyObject *dap_enc_key_new_generate_py(PyObject *self, PyObject *args){ ///!!!!!!! ERR
+ /*int type_key;
+ PyObject *kex_buf;
+ size_t kex_size;
+ PyObject* seed,
+ size_t seed_size;
+ size_t key_size
+ if (PyArg_ParseTuple(args, "i|O|n|O|n|n", &type_key, &kex_buf, &kex_size, &seed, &seed_size, &key_size)){
+ return NULL;
+ }
+ //dap_enc_key_new_generate - restart*/
return PyLong_FromLong(0);
}
// update struct dap_enc_key_t after insert foreign keys
PyObject* dap_enc_key_update_py(PyObject *self, PyObject *args){
+ uint8_t key_id;
+ if (!PyArg_ParseTuple(args, "h", &key_id)){
+ return NULL;
+ }
+ dap_enc_key_t *key = key_list_get_key(keys, key_id);
+ if (key == NULL) {
+ return NULL;
+ }
+ dap_enc_key_update(key);
return PyLong_FromLong(0);
}
// for asymmetric gen public key
-PyObject *dap_enc_gen_pub_key_from_priv_py(PyObject *self, PyObject *args){
+PyObject *dap_enc_gen_pub_key_from_priv_py(PyObject *self, PyObject *args){ //NOTE libdap-crypto/src/libdap-crypto.c
return PyLong_FromLong(0);
}
PyObject *dap_enc_gen_key_public_size_py(PyObject *self, PyObject *args){
- return PyLong_FromLong(0);
+ uint8_t key_id;
+ if (PyArg_ParseTuple(args, "h", &key_id)){
+ return NULL;
+ }
+ dap_enc_key_t *key = key_list_get_key(keys, key_id);
+ if (key == NULL){
+ return NULL;
+ }
+ size_t size = dap_enc_gen_key_public_size(key);
+ return PyLong_FromSize_t(size);
}
+
PyObject *dap_enc_gen_key_public_py(PyObject *self, PyObject *args){
- return PyLong_FromLong(0);
+ uint8_t key_id;
+ PyObject *obj;
+ if (PyArg_ParseTuple(args, "h|O", &key_id, &obj)){
+ return NULL;
+ }
+ dap_enc_key_t *key = key_list_get_key(keys, key_id);
+ if (key == NULL){
+ return NULL;
+ }
+ int size = dap_enc_gen_key_public(key, obj);
+ return PyLong_FromLong(size);
}
PyObject *dap_enc_key_signature_delete_py(PyObject *self, PyObject *args){
+ int type_key;
+ uint8_t *a_sig_buf;
+ uint8_t sig_buf;
+ if(!PyArg_ParseTuple(args, "i|h", &type_key, &sig_buf)){
+ return NULL;
+ }
+ if (type_key < 0 || type_key > 16){
+ return PyLong_FromLong(-1);
+ }
+ a_sig_buf = (uint8_t*)sig_buf;
+ dap_enc_key_signature_delete(type_key, a_sig_buf);
return PyLong_FromLong(0);
}
--
GitLab