From 6e835a3a748734b7e4fe0219d594f3bc9901b627 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Sun, 23 Feb 2020 01:49:47 +0700
Subject: [PATCH] [*] Fixed LOG_TAG and few other defines
---
include/libdap-crypto-python.h | 2 --
include/wrapping_dap_enc_iaes.h | 3 ---
include/wrapping_dap_enc_key.h | 2 --
src/libdap-crypto-python.c | 2 ++
src/wrapping_dap_enc_iaes.c | 2 ++
src/wrapping_dap_enc_key.c | 2 ++
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/include/libdap-crypto-python.h b/include/libdap-crypto-python.h
index e9027124..8e959d1f 100644
--- a/include/libdap-crypto-python.h
+++ b/include/libdap-crypto-python.h
@@ -13,8 +13,6 @@
extern "C" {
#endif
-#undef LOG_TAG
-#define LOG_TAG "libdap-python-crypto"
typedef struct PyCrypto{
PyObject_HEAD
diff --git a/include/wrapping_dap_enc_iaes.h b/include/wrapping_dap_enc_iaes.h
index e531d6cf..6d357bc9 100644
--- a/include/wrapping_dap_enc_iaes.h
+++ b/include/wrapping_dap_enc_iaes.h
@@ -10,9 +10,6 @@
extern "C" {
#endif
-#undef LOG_TAG
-#define LOG_TAG "wrapping-dap-enc-iaes"
-
PyObject* dap_enc_iaes_key_new_py(PyObject *self, PyObject *args);
PyObject* dap_enc_iaes_key_delete_py(PyObject *self, PyObject *args);
diff --git a/include/wrapping_dap_enc_key.h b/include/wrapping_dap_enc_key.h
index 079c6d66..9645f4ad 100644
--- a/include/wrapping_dap_enc_key.h
+++ b/include/wrapping_dap_enc_key.h
@@ -10,8 +10,6 @@
extern "C" {
#endif
-#undef LOG_TAG
-#define LOG_TAG "wrapping-dap-enc-key"
PyObject* dap_enc_key_get_enc_size_py(PyObject *self, PyObject *args);//dap_enc_key_t * a_key, const size_t buf_in_size); -> size_t
PyObject* dap_enc_key_get_dec_size_py(PyObject *self, PyObject *args);//dap_enc_key_t * a_key, const size_t buf_in_size); -> size_t
diff --git a/src/libdap-crypto-python.c b/src/libdap-crypto-python.c
index bc3b7449..d77cd9b8 100644
--- a/src/libdap-crypto-python.c
+++ b/src/libdap-crypto-python.c
@@ -1,5 +1,7 @@
#include "libdap-crypto-python.h"
+#define LOG_TAG "dap_crypto_python"
+
int dap_crypto_init(void){
if(dap_enc_init()!=0){
log_it(L_CRITICAL,"Can't init encryption module");
diff --git a/src/wrapping_dap_enc_iaes.c b/src/wrapping_dap_enc_iaes.c
index 843ce0cd..f5e70963 100644
--- a/src/wrapping_dap_enc_iaes.c
+++ b/src/wrapping_dap_enc_iaes.c
@@ -1,5 +1,7 @@
#include "wrapping_dap_enc_iaes.h"
+#define LOG_TAG "wrapping-dap-enc-iaes"
+
PyObject* dap_enc_iaes_key_new_py(PyObject *self, PyObject *args){
PyObject *obj_key;
diff --git a/src/wrapping_dap_enc_key.c b/src/wrapping_dap_enc_key.c
index 6779ad27..b9d07c1b 100644
--- a/src/wrapping_dap_enc_key.c
+++ b/src/wrapping_dap_enc_key.c
@@ -1,5 +1,7 @@
#include "wrapping_dap_enc_key.h"
+#define LOG_TAG "wrapping-dap-enc-key"
+
PyObject* dap_enc_key_get_enc_size_py(PyObject *self, PyObject *args){
PyObject *in_key;
size_t buff_in_size;
--
GitLab