Skip to content
Snippets Groups Projects
Commit 95fb9204 authored by alexey.stratulat's avatar alexey.stratulat
Browse files

[-] Deleted the key list since the Crypto.Key object will be used in its place.

parent d0fd0ca9
No related branches found
No related tags found
1 merge request!26Support 3689
Hide whitespace changes
Inline Side-by-side
include/key_list.h deleted 100644 → 0
+ 0
− 32
View file @ d0fd0ca9
#ifndef KEY_LIST_H
#define KEY_LIST_H
#include "dap_common.h"
#include "dap_enc_key.h"
#include <stdint.h>
#include <string.h>
#ifdef __cplusplus
extern "C" {
#endif
#undef LOG_TAG
#define LOG_TAG "key-list"
typedef struct key_list{
dap_enc_key_t **keys;
uint8_t lenght;
}key_list_t;
key_list_t *key_list_init(void);
void key_list_free(key_list_t* list);
uint8_t key_list_add_element(key_list_t *list, dap_enc_key_t* key);
bool key_list_del_element(key_list_t *list, uint8_t key);
dap_enc_key_t *key_list_get_key(key_list_t *list, uint8_t key);
#ifdef __cplusplus
}
#endif
#endif
include/libdap-crypto-python.h
+ 41
− 79
View file @ 95fb9204
...@@ -16,95 +16,57 @@ extern "C" { ...@@ -16,95 +16,57 @@ extern "C" {
#undef LOG_TAG #undef LOG_TAG
#define LOG_TAG "libdap-python-crypto" #define LOG_TAG "libdap-python-crypto"
typedef struct PyCrypto{ static PyObject *dap_crypto_init(PyObject *self, PyObject *args);
PyObject_HEAD
} PyCryptoObject;
int dap_crypto_init(void); static PyObject *dap_crypto_deinit();
void dap_crypto_deinit(void);
static PyObject *dap_log_it_debug(PyObject *self, PyObject *args);
static PyObject *dap_log_it_info(PyObject *self, PyObject *args);
static PyMethodDef DapCryptoMethods[] = { static PyMethodDef DapCryptoMethods[] = {
{"encodeBase58", (PyCFunction)dap_encode_base58_py, METH_VARARGS | METH_STATIC, "Encrypts information using the base58 algorithm from the DAP crypto library"}, {"init", dap_crypto_init, METH_VARARGS, "Initialization of the DAP (Deus Applicaions Prototypes) crypto library"},
{"decodeBase58", (PyCFunction)dap_decode_base58_py, METH_VARARGS | METH_STATIC, "Dencrypts information using the base58 algorithm from the DAP crypto library"}, {"deinit", dap_crypto_deinit, METH_NOARGS, "Deinitialization of the DAP (Deus Applicaions Prototypes) crypto library"},
{"encodeBase64", (PyCFunction)dap_encode_base64_py, METH_VARARGS | METH_STATIC, "Encrypts information using the base64 algorithm from the DAP crypto library"}, {"encodeBase58", dap_encode_base58_py, METH_VARARGS, "Encrypts information using the base58 algorithm from the DAP crypto library"},
{"decodeBase64", (PyCFunction)dap_decode_base64_py, METH_VARARGS | METH_STATIC, "Dencrypts information using the base64 algorithm from the DAP crypto library"}, {"decodeBase58", dap_decode_base58_py, METH_VARARGS, "Dencrypts information using the base58 algorithm from the DAP crypto library"},
{"newKey", (PyCFunction)dap_enc_key_new_py, METH_VARARGS | METH_STATIC, "The function creates a new key, and returns it with PyObject."}, {"encodeBase64", dap_encode_base64_py, METH_VARARGS, "Encrypts information using the base64 algorithm from the DAP crypto library"},
{"delKey", (PyCFunction)dap_enc_key_delete_py, METH_VARARGS | METH_STATIC, ""}, {"decodeBase64", dap_decode_base64_py, METH_VARARGS, "Dencrypts information using the base64 algorithm from the DAP crypto library"},
{"generateNewKey", (PyCFunction)dap_enc_key_new_generate_py, METH_VARARGS | METH_STATIC, ""}, {"logItDebug", dap_log_it_debug, METH_VARARGS, ""},
{"getEncSizeKey", (PyCFunction)dap_enc_key_get_enc_size_py, METH_VARARGS | METH_STATIC, ""}, {"logItInfo", dap_log_it_info, METH_VARARGS, ""},
{"getDecSizeKey", (PyCFunction)dap_enc_key_get_dec_size_py, METH_VARARGS | METH_STATIC, ""}, {"newKey", dap_enc_key_new_py, METH_VARARGS, "The function creates a new key, and returns it with PyObject."},
{"delKey", dap_enc_key_delete_py, METH_VARARGS, ""},
{"generateNewKey", dap_enc_key_new_generate_py, METH_VARARGS, ""},
{"getEncSizeKey", dap_enc_key_get_enc_size_py, METH_VARARGS, ""},
{"getDecSizeKey", dap_enc_key_get_dec_size_py, METH_VARARGS, ""},
/*IAES256*/ /*IAES256*/
{"newKeyIAES", (PyCFunction)dap_enc_iaes_key_new_py, METH_VARARGS | METH_STATIC, ""}, {"newKeyIAES", dap_enc_iaes_key_new_py, METH_VARARGS, ""},
{"deleteKeyIAES", (PyCFunction)dap_enc_iaes_key_delete_py, METH_VARARGS | METH_STATIC, ""}, {"deleteKeyIAES", dap_enc_iaes_key_delete_py, METH_VARARGS, ""},
{"generateKeyIAES", (PyCFunction)dap_enc_iaes_key_generate_py, METH_VARARGS | METH_STATIC, ""}, {"generateKeyIAES", dap_enc_iaes_key_generate_py, METH_VARARGS, ""},
{"encodeSizeIAES256", (PyCFunction)dap_enc_iaes256_calc_encode_size_py, METH_VARARGS | METH_STATIC, ""}, {"encodeSizeIAES256", dap_enc_iaes256_calc_encode_size_py, METH_VARARGS, ""},
{"decodeSizeIAES256", (PyCFunction)dap_enc_iaes256_calc_decode_size_py, METH_VARARGS | METH_STATIC, ""}, {"decodeSizeIAES256", dap_enc_iaes256_calc_decode_size_py, METH_VARARGS, ""},
{"encryptIAES256CBCFast", (PyCFunction)dap_enc_iaes256_cbc_encrypt_fast_py, METH_VARARGS | METH_STATIC, ""}, {"encryptIAES256CBCFast", dap_enc_iaes256_cbc_encrypt_fast_py, METH_VARARGS, ""},
{"decryptIAES256CBCFast", (PyCFunction)dap_enc_iaes256_cbc_decrypt_fast_py, METH_VARARGS | METH_STATIC, ""}, {"decryptIAES256CBCFast", dap_enc_iaes256_cbc_decrypt_fast_py, METH_VARARGS, ""},
/*OAES*/ /*OAES*/
{"newKeyOAES", (PyCFunction)dap_enc_oaes_key_new_py, METH_VARARGS | METH_STATIC, ""}, {"newKeyOAES", dap_enc_oaes_key_new_py, METH_VARARGS, ""},
{"deleteKeyOAES", (PyCFunction)dap_enc_oaes_key_delete_py, METH_VARARGS | METH_STATIC, ""}, {"deleteKeyOAES", dap_enc_oaes_key_delete_py, METH_VARARGS, ""},
{"generateKeyOAES", (PyCFunction)dap_enc_oaes_key_generate_py, METH_VARARGS | METH_STATIC, ""}, {"generateKeyOAES", dap_enc_oaes_key_generate_py, METH_VARARGS, ""},
{"encodeSizeOAES", (PyCFunction)dap_enc_oaes_calc_encode_size_py, METH_VARARGS | METH_STATIC, ""}, {"encodeSizeOAES", dap_enc_oaes_calc_encode_size_py, METH_VARARGS, ""},
{"decodeSizeOAES", (PyCFunction)dap_enc_oaes_calc_decode_size_py, METH_VARARGS | METH_STATIC, ""}, {"decodeSizeOAES", dap_enc_oaes_calc_decode_size_py, METH_VARARGS, ""},
{"encryptOAESFast", (PyCFunction)dap_enc_oaes_encrypt_fast_py, METH_VARARGS | METH_VARARGS | METH_STATIC, ""}, {"encryptOAESFast", dap_enc_oaes_encrypt_fast_py, METH_VARARGS, ""},
{"decryptOAESFast", (PyCFunction)dap_enc_oaes_decrypt_fast_py, METH_VARARGS | METH_STATIC, ""}, {"decryptOAESFast", dap_enc_oaes_decrypt_fast_py, METH_VARARGS, ""},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };
PyTypeObject dapCrypto_dapCryptoType = { static struct PyModuleDef dapcryptomodule = {
PyVarObject_HEAD_INIT(NULL, 0) PyModuleDef_HEAD_INIT,
"libCellFrame.crypto", /* tp_name */ "libdap_crypto_python_module", /* name of module */
sizeof(PyCryptoObject), /* tp_basicsize */ NULL, /* module documentation, may be NULL */
0, /* tp_itemsize */ -1, /* size of per-interpreter state of the module,
0,//(destructor)Noddy_dealloc, /* tp_dealloc */ or -1 if the module keeps state in global variables. */
0, /* tp_print */ DapCryptoMethods
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 */
"Dap crypto objects", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
DapCryptoMethods,//Noddy_methods, /* tp_methods */
0,//Noddy_members, /* tp_members */
0,//Noddy_getseters, /* 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,//Noddy_new, /* tp_new */
}; };
PyMODINIT_FUNC PyInit_libdap_crypto_python_module(void);
//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 #ifdef __cplusplus
} }
......
src/key_list.c deleted 100644 → 0
+ 0
− 57
View file @ d0fd0ca9
#include "key_list.h"
key_list_t *key_list_init()
{
key_list_t *keyList = (key_list_t *)malloc(sizeof(key_list_t));
keyList->lenght = 0;
return keyList;
}
void key_list_free(key_list_t* list){
for (int i=0; i < list->lenght;i++){
free(list->keys[i]);
}
free(list);
}
uint8_t key_list_add_element(key_list_t *list, dap_enc_key_t* key){
uint8_t new_len = list->lenght;
new_len++;
dap_enc_key_t **new_keys = calloc(new_len, sizeof(dap_enc_key_t));
if (list->lenght != 0) {
memcpy(new_keys, list->keys, list->lenght);
free(list->keys);
}
new_keys[new_len - 1] = key;
list->keys = new_keys;
list->lenght = new_len;
return new_len;
}
bool key_list_del_element(key_list_t *list, uint8_t key_id){
if ((list->lenght-1) > 0) {
return false;
}
uint8_t new_len = list->lenght;
new_len--;
dap_enc_key_t **new_keys = calloc(new_len, sizeof(dap_enc_key_t));
if (list->lenght - 1 == key_id){
memcpy(new_keys, list->keys, key_id);
} else if (list->lenght > 1 && key_id < list->lenght) {
memcpy(new_keys, list->keys, key_id);
memcpy(new_keys + key_id, list->keys + (key_id + 1), list->lenght);
}
free(list->keys);
list->keys = new_keys;
list->lenght = new_len;
return true;
}
dap_enc_key_t *key_list_get_key(key_list_t *list, uint8_t key){
uint8_t index = key - 1;
if (list->lenght < index) {
return NULL;
}
return list->keys[index];
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment