diff --git a/include/libdap-crypto-python.h b/include/libdap-crypto-python.h
index e5ff3218d891a13ecf8246aeab5d126f5c5c5c38..e9027124994509bea803f59e30d24101d71f5d65 100644
--- a/include/libdap-crypto-python.h
+++ b/include/libdap-crypto-python.h
@@ -3,7 +3,6 @@
#include "dap_enc.h"
#include "dap_enc_key.h"
#include "dap_common.h"
-//#include "libdap-crypto-key-python.h"
#include "wrapping_base58.h"
#include "wrapping_base64.h"
#include "wrapping_dap_enc_key.h"
@@ -55,10 +54,10 @@ static PyMethodDef CryptoMethods[] = {
static PyTypeObject dapCrypto_dapCryptoType = {
PyVarObject_HEAD_INIT(NULL, 0)
- "libCellFrame.Crypto", /* tp_name */
- sizeof(PyCryptoObject), /* tp_basicsize */
+ "CellFrame.Crypto", /* tp_name */
+ sizeof(PyCryptoObject), /* tp_basicsize */
0, /* tp_itemsize */
- 0,//(destructor)Noddy_dealloc, /* tp_dealloc */
+ 0, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
@@ -90,22 +89,11 @@ static PyTypeObject dapCrypto_dapCryptoType = {
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
- 0,//(initproc)PyDapEventsObject_init,//(initproc)Noddy_init, /* tp_init */
+ 0, /* tp_init */
0, /* tp_alloc */
- PyType_GenericNew,//PyDapEventsObject_new,//Noddy_new, /* tp_new */
+ PyType_GenericNew, /* tp_new */
};
-//static struct PyModuleDef dapcryptomodule = {
-// PyModuleDef_HEAD_INIT,
-// "libdap_crypto_python_module", /* name of module */
-// NULL, /* module documentation, may be NULL */
-// -1, /* size of per-interpreter state of the module,
-// or -1 if the module keeps state in global variables. */
-// DapCryptoMethods
-//};
-
-//PyMODINIT_FUNC PyInit_libdap_crypto_python_module(void);
-
#ifdef __cplusplus
}
#endif
diff --git a/include/libdap_crypto_data_type.h b/include/libdap_crypto_data_type.h
index 15a8599c747e8f1f042c86397cdbb905edc6787f..1a84d90389a7ed7c388ece6b5045f8a5ebae2417 100644
--- a/include/libdap_crypto_data_type.h
+++ b/include/libdap_crypto_data_type.h
@@ -29,44 +29,44 @@ static PyMethodDef PyCryptoDataTypeObjecyMethods[] = {
static PyTypeObject CryptoDataTypeObjecy_CryptoDataTypeObjecyType = {
PyVarObject_HEAD_INIT(NULL, 0)
- "libCellFrame.CryptoDataType", /* tp_name */
- sizeof(PyCryptoDataTypeObjecy), /* tp_basicsize */
- 0, /* tp_itemsize */
- 0,//(destructor)Noddy_dealloc, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_reserved */
- 0, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- 0, /* tp_hash */
- 0, /* tp_call */
- 0, /* tp_str */
- 0, /* tp_getattro */
- 0, /* tp_setattro */
- 0, /* tp_as_buffer */
+ "CellFrame.CryptoDataType", /* tp_name */
+ sizeof(PyCryptoDataTypeObjecy), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ 0, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_reserved */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ 0, /* tp_call */
+ 0, /* tp_str */
+ 0, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT |
- Py_TPFLAGS_BASETYPE, /* tp_flags */
- "Crypto data type objects", /* tp_doc */
- 0, /* tp_traverse */
- 0, /* tp_clear */
- 0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- 0, /* tp_iter */
- 0, /* tp_iternext */
- PyCryptoDataTypeObjecyMethods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- 0, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- 0,//(initproc)PyDapEventsObject_init,//(initproc)Noddy_init, /* tp_init */
- 0, /* tp_alloc */
- PyType_GenericNew,//PyDapEventsObject_new,//Noddy_new, /* tp_new */
+ Py_TPFLAGS_BASETYPE, /* tp_flags */
+ "Crypto data type objects", /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ PyCryptoDataTypeObjecyMethods, /* tp_methods */
+ 0, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ PyType_GenericNew, /* tp_new */
};
#ifdef __cplusplus
diff --git a/include/libdap_crypto_key_python.h b/include/libdap_crypto_key_python.h
index c9bfdfe3f04e4af46ce77c7ffbba19e0ac290372..109776d211761d0e9e1d525c370f4f7fadfc6e3a 100644
--- a/include/libdap_crypto_key_python.h
+++ b/include/libdap_crypto_key_python.h
@@ -19,26 +19,26 @@ static void PyCryptoKeyObject_dealloc(PyCryptoKeyObject *cryptoObject){
static PyTypeObject PyCryptoKeyObject_PyCryptoKeyType = {
PyVarObject_HEAD_INIT(NULL, 0)
- "libCellFrame.Crypto.Key", /* tp_name */
- sizeof(PyCryptoKeyObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- (destructor)PyCryptoKeyObject_dealloc, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_compare */
- 0, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- 0, /* tp_hash */
- 0, /* tp_call */
- 0, /* tp_str */
- 0, /* tp_getattro */
- 0, /* tp_setattro */
- 0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT, /* tp_flags */
- "Crypto key objects", /* tp_doc */
+ "CellFrame.Crypto.Key", /* tp_name */
+ sizeof(PyCryptoKeyObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ (destructor)PyCryptoKeyObject_dealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_compare */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ 0, /* tp_call */
+ 0, /* tp_str */
+ 0, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT, /* tp_flags */
+ "Crypto key objects", /* tp_doc */
};
#ifdef __cplusplus
diff --git a/include/libdap_crypto_key_type_python.h b/include/libdap_crypto_key_type_python.h
index 1f60614afe4c6e965c02e48568c858813919cd03..0ccb9829a1a92f59676a63228b1aeaac29f1a4d2 100644
--- a/include/libdap_crypto_key_type_python.h
+++ b/include/libdap_crypto_key_type_python.h
@@ -54,44 +54,44 @@ static PyMethodDef PyCryptoKeyTypeObjecyMethods[] = {
static PyTypeObject CryptoKeyTypeObjecy_CryptoKeyTypeObjecyType = {
PyVarObject_HEAD_INIT(NULL, 0)
- "libCellFrame.CryptoKeyType", /* tp_name */
- sizeof(PyCryptoKeyTypeObjecy), /* tp_basicsize */
- 0, /* tp_itemsize */
- 0,//(destructor)Noddy_dealloc, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_reserved */
- 0, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- 0, /* tp_hash */
- 0, /* tp_call */
- 0, /* tp_str */
- 0, /* tp_getattro */
- 0, /* tp_setattro */
- 0, /* tp_as_buffer */
+ "CellFrame.CryptoKeyType", /* tp_name */
+ sizeof(PyCryptoKeyTypeObjecy), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ 0, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_reserved */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ 0, /* tp_call */
+ 0, /* tp_str */
+ 0, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT |
- Py_TPFLAGS_BASETYPE, /* tp_flags */
- "Crypto keys type objects", /* tp_doc */
- 0, /* tp_traverse */
- 0, /* tp_clear */
- 0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- 0, /* tp_iter */
- 0, /* tp_iternext */
- PyCryptoKeyTypeObjecyMethods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- 0, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- 0,//(initproc)PyDapEventsObject_init,//(initproc)Noddy_init, /* tp_init */
- 0, /* tp_alloc */
- PyType_GenericNew,//PyDapEventsObject_new,//Noddy_new, /* tp_new */
+ Py_TPFLAGS_BASETYPE, /* tp_flags */
+ "Crypto keys type objects", /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ PyCryptoKeyTypeObjecyMethods, /* tp_methods */
+ 0, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ PyType_GenericNew, /* tp_new */
};
#ifdef __cplusplus
diff --git a/include/wrapping_dap_enc_oaes.h b/include/wrapping_dap_enc_oaes.h
index 823b44b43ccd2d7751b9ba250285d63b71594573..b2bf79dc206414582ab0f07d0ada19874ff4df57 100644
--- a/include/wrapping_dap_enc_oaes.h
+++ b/include/wrapping_dap_enc_oaes.h
@@ -10,23 +10,21 @@
extern "C" {
#endif
-PyObject *dap_enc_oaes_key_new_py(PyObject *self, PyObject *args);//struct dap_enc_key * a_key);
-PyObject *dap_enc_oaes_key_delete_py(PyObject *self, PyObject *args);//struct dap_enc_key *a_key);
-PyObject *dap_enc_oaes_key_generate_py(PyObject *self, PyObject *args);//struct dap_enc_key * a_key, const void *kex_buf,
- //size_t kex_size, const void * seed, size_t seed_size, size_t key_size);
+PyObject *dap_enc_oaes_key_new_py(PyObject *self, PyObject *args);
+PyObject *dap_enc_oaes_key_delete_py(PyObject *self, PyObject *args);
+PyObject *dap_enc_oaes_key_generate_py(PyObject *self, PyObject *args);
-PyObject *dap_enc_oaes_calc_decode_size_py(PyObject *self, PyObject *args);//const size_t size_in);
-PyObject *dap_enc_oaes_calc_encode_size_py(PyObject *self, PyObject *args);//const size_t size_in);
+PyObject *dap_enc_oaes_calc_decode_size_py(PyObject *self, PyObject *args);
+PyObject *dap_enc_oaes_calc_encode_size_py(PyObject *self, PyObject *args);
-PyObject *dap_enc_oaes_decrypt_py(PyObject *self, PyObject *args);//struct dap_enc_key * a_key, const void * a_in, size_t a_in_size, void ** a_out);
-PyObject *dap_enc_oaes_encrypt_py(PyObject *self, PyObject *args);//struct dap_enc_key * a_key, const void * a_in, size_t a_in_size, void ** a_out);
+PyObject *dap_enc_oaes_decrypt_py(PyObject *self, PyObject *args);
+PyObject *dap_enc_oaes_encrypt_py(PyObject *self, PyObject *args);
// Writes result ( out ) in already allocated buffer
-PyObject *dap_enc_oaes_decrypt_fast_py(PyObject *self, PyObject *args);//struct dap_enc_key * a_key, const void * a_in,
- //size_t a_in_size, void * buf_out, size_t buf_out_size);
+PyObject *dap_enc_oaes_decrypt_fast_py(PyObject *self, PyObject *args);
// Writes result ( out ) in already allocated buffer
-PyObject *dap_enc_oaes_encrypt_fast_py(PyObject *self, PyObject *args);//struct dap_enc_key * a_key, const void * a_in,
- //size_t a_in_size, void * buf_out, size_t buf_out_size);
+PyObject *dap_enc_oaes_encrypt_fast_py(PyObject *self, PyObject *args);
+
#ifdef __cplusplus
diff --git a/src/libdap-crypto-python.c b/src/libdap-crypto-python.c
index 5b645c12835f21ced1fae1f7674c9e1d0a5eaa25..bc3b74497b739c38dbdccb45074697a52256ca3e 100644
--- a/src/libdap-crypto-python.c
+++ b/src/libdap-crypto-python.c
@@ -17,33 +17,3 @@ void dap_crypto_deinit(void){
dap_enc_key_deinit();
dap_enc_deinit();
}
-
-
-//PyMODINIT_FUNC PyInit_libdap_crypto_python_module(void){
-// return PyModule_Create(&dapcryptomodule);
-//}
-
-//int main(int argc, char **argv) {
-// wchar_t *program = Py_DecodeLocale(argv[0], NULL);
-// if (program == NULL) {
-// fprintf(stderr, "Fatal error: cannot decode argv[0]\n");
-// exit(1);
-// }
-
-// /* Add a built-in module, before Py_Initialize */
-// PyImport_AppendInittab("libdap_crypto_python_module", PyInit_libdap_crypto_python_module);
-
-// /* Pass argv[0] to the Python interpreter */
-// Py_SetProgramName(program);
-
-// /* Initialize the Python interpreter. Required. */
-// Py_Initialize();
-
-// /* Optionally import the module; alternatively,
-// import can be deferred until the embedded script
-// imports it. */
-// PyImport_ImportModule("libdap_crypto_python_module");
-
-// PyMem_RawFree(program);
-// return 0;
-//}
diff --git a/src/wrapping_base64.c b/src/wrapping_base64.c
index aaf19232e27938305a4b6fb882e70d6ab9aef2e3..53d562025ec07ebb6e240d67e2b095be02f97ba0 100644
--- a/src/wrapping_base64.c
+++ b/src/wrapping_base64.c
@@ -26,7 +26,6 @@
return NULL;
}
void *res = DAP_NEW_SIZE(void*, DAP_ENC_BASE64_ENCODE_SIZE(strlen(in_str)));
- //size_t decrypted_size = dap_enc_base58_decode(in_str, res);
size_t decrypted_size = dap_enc_base64_decode(in_str, strlen(in_str), res, l_dap_enc_data_type);
PyBytesObject *return_object = (PyBytesObject*)PyBytes_FromStringAndSize(res, (Py_ssize_t)decrypted_size);
return Py_BuildValue("O", return_object);
diff --git a/src/wrapping_dap_enc_iaes.c b/src/wrapping_dap_enc_iaes.c
index c8433a5437d9f37b0b3c1576531cc960559f0600..843ce0cd461c09f8187b31d82c5be0acd3929c8c 100644
--- a/src/wrapping_dap_enc_iaes.c
+++ b/src/wrapping_dap_enc_iaes.c
@@ -6,9 +6,6 @@ PyObject* dap_enc_iaes_key_new_py(PyObject *self, PyObject *args){
if (PyArg_ParseTuple(args, "O", &obj_key)){
return NULL;
}
-// if (key == NULL){
-// return NULL;
-// }
dap_enc_aes_key_new(((PyCryptoKeyObject*)obj_key)->key);
return PyLong_FromLong(0);
}
@@ -32,11 +29,6 @@ PyObject* dap_enc_iaes_key_generate_py(PyObject *self, PyObject *args){
if (PyArg_ParseTuple(args, "O|S|n|S|n", &in_key, &in_kex_buf, &in_kex_size, &in_seed, &in_seed_size)){
return NULL;
}
-// dap_enc_key_t *key = key_list_get_key(keys_iaes, in_key_id);
-// if (key == NULL){
-// return NULL;
-// }
-// PyObject *new_key = _PyObject_New(&PyCryptoKeyObject_PyCryptoKeyType);
size_t key_size = sizeof(((PyCryptoKeyObject*)in_key)->key);
void* kex_buf = NULL;
PyBytes_AsStringAndSize((PyObject*)in_kex_buf, kex_buf, (Py_ssize_t*)in_kex_size);
@@ -67,42 +59,10 @@ PyObject* dap_enc_iaes256_calc_decode_size_py(PyObject *self, PyObject *args){
PyObject* dap_enc_iaes256_cbc_decrypt_py(PyObject *self, PyObject *args){
//TODO
return PyLong_FromLong(0);
- /*uint8_t key_id;
- PyBytesObject *in_obj;
- size_t in_size;
- void **a_out = NULL;
- if (!PyArg_ParseTuple(args, "h|S|n", &key_id, &in_obj, &in_size)){
- return NULL;
- }
- dap_enc_key_t *key = key_list_get_key(keys_iaes, key_id);
- if (key == NULL){
- return NULL;
- }
- //void *in = PyBytes_AsString(in_obj);
- void *in_void = PyBytes_AsString((PyObject*)in_obj);
- in_size = (size_t)PyBytes_GET_SIZE(in_obj);
- dap_enc_iaes256_cbc_decrypt(key, in_void, in_size, a_out);
- //TODO
- return Py_BuildValue("O", a_out);*/
}
PyObject* dap_enc_iaes256_cbc_encrypt_py(PyObject *self, PyObject *args){
//TODO
return PyLong_FromLong(0);
- /*uint8_t key_id;
- PyBytesObject *in_obj;
- size_t in_size;
- void **a_out = NULL;
- if (!PyArg_ParseTuple(args, "h|S|n", &key_id, &in_obj, &in_size)){
- return NULL;
- }
- dap_enc_key_t *key = key_list_get_key(keys_iaes, key_id);
- if (key == NULL){
- return NULL;
- }
- void *in_void = PyBytes_AsString((PyObject*)in_obj);
- in_size = (size_t)PyBytes_GET_SIZE(in_obj);
- dap_enc_iaes256_cbc_encrypt(key, in_void, in_size, a_out);
- return PyBytes_FromFormat("%p", a_out);*/
}
// Writes result ( out ) in already allocated buffer
@@ -114,10 +74,6 @@ PyObject* dap_enc_iaes256_cbc_decrypt_fast_py(PyObject *self, PyObject *args){
if (!PyArg_ParseTuple(args, "O|S|n|n", &in_key, &a_in, &a_in_size, &buf_out_size)){
return NULL;
}
-// dap_enc_key_t *key = key_list_get_key(keys_iaes, key_id);
-// if (key == NULL){
-// return NULL;
-// }
void *in = PyBytes_AsString((PyObject*)a_in);
void *out = DAP_NEW_SIZE(void*, buf_out_size);
size_t res_denc_size = dap_enc_iaes256_cbc_decrypt_fast(((PyCryptoKeyObject*)in_key)->key, in, a_in_size, out, buf_out_size);
diff --git a/src/wrapping_dap_enc_oaes.c b/src/wrapping_dap_enc_oaes.c
index bf7aa9e61696f5492ba161e3e4fa14a451687621..e3ed4bd9ade18d5f8f83d712d835b83a7095e0a8 100644
--- a/src/wrapping_dap_enc_oaes.c
+++ b/src/wrapping_dap_enc_oaes.c
@@ -6,10 +6,6 @@ PyObject *dap_enc_oaes_key_new_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_oaes_key_new(((PyCryptoKeyObject*)in_key)->key);
return PyLong_FromLong(0);
}
@@ -30,10 +26,6 @@ PyObject *dap_enc_oaes_key_generate_py(PyObject *self, PyObject *args){
if (PyArg_ParseTuple(args, "O|S|n|S|n", &in_key, &in_kex_buf, &in_kex_size, &in_seed, &in_seed_size)){
return NULL;
}
-// dap_enc_key_t *key = key_list_get_key(keys_oaes, in_key_id);
-// if (key == NULL){
-// return NULL;
-// }
size_t key_size = sizeof(((PyCryptoKeyObject*)in_key)->key);
void* kex_buf = NULL;
PyBytes_AsStringAndSize((PyObject*)in_kex_buf, kex_buf, (Py_ssize_t*)in_kex_size);
@@ -78,10 +70,6 @@ PyObject *dap_enc_oaes_decrypt_fast_py(PyObject *self, PyObject *args){
if (!PyArg_ParseTuple(args, "O|S|n|n", &in_key, &a_in, &a_in_size, &buf_out_size)){
return NULL;
}
-// dap_enc_key_t *key = key_list_get_key(keys_oaes, key_id);
-// if (key == NULL){
-// return NULL;
-// }
void *in = PyBytes_AsString((PyObject*)a_in);
void *out = DAP_NEW_SIZE(void*, buf_out_size);
size_t res_denc_size = dap_enc_oaes_decrypt_fast(((PyCryptoKeyObject*)in_key)->key, in, a_in_size, out, buf_out_size);
@@ -97,10 +85,6 @@ PyObject *dap_enc_oaes_encrypt_fast_py(PyObject *self, PyObject *args){
if (!PyArg_ParseTuple(args, "O|S|n|n", &in_key, &a_in, &a_in_size, &buf_out_size)){
return NULL;
}
-// dap_enc_key_t *key = key_list_get_key(keys_oaes, key_id);
-// if (key == NULL){
-// return NULL;
-// }
void *in = PyBytes_AsString((PyObject*)a_in);
void *out = DAP_NEW_SIZE(void*, buf_out_size);
size_t res_enc_size = dap_enc_oaes_encrypt_fast(((PyCryptoKeyObject*)in_key)->key, in, a_in_size, out, buf_out_size);