Enable/Disable logs using config file am: b3b241a42d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/st/secure_element2/+/18282343
Change-Id: I669a22dbf93594f2bd0614a9e31e50dbe2599d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/secure_element/1.0/SecureElement.cpp b/secure_element/1.0/SecureElement.cpp
index af63040..adedfcb 100644
--- a/secure_element/1.0/SecureElement.cpp
+++ b/secure_element/1.0/SecureElement.cpp
@@ -49,6 +49,7 @@
uint8_t getResponse[5] = {0x00, 0xC0, 0x00, 0x00, 0x00};
static struct se_gto_ctx *ctx;
+bool debug_log_enabled = false;
SecureElement::SecureElement(const char* ese_name){
nbrOpenChannel = 0;
@@ -99,7 +100,7 @@
return EXIT_FAILURE;
}
//settings = default_settings(ctx);
- se_gto_set_log_level(ctx, 4);
+ se_gto_set_log_level(ctx, 3);
openConfigFile(1);
@@ -548,6 +549,8 @@
int len = 0;
int input_len = n;
+ if (!debug_log_enabled) return;
+
msg = (char*) malloc ( (pf ? strlen(pf) : 0) + input_len * 3 + 1);
if(!msg) {
errno = ENOMEM;
@@ -636,13 +639,26 @@
continue;
}
- pch = strtok (s," =;");
- if (strcmp("GTO_DEV", pch) == 0){
- pch = strtok (NULL, " =;");
+ pch = strtok(s," =;");
+ if (strcmp("GTO_DEV", pch) == 0) {
+ pch = strtok(NULL, " =;");
ALOGD("SecureElement:%s Defined node : %s", __func__, pch);
- if (strlen (pch) > 0 && strcmp("\n",pch) != 0 && strcmp("\0",pch) != 0 ) se_gto_set_gtodev(ctx, pch);
+ if (strlen(pch) > 0 && strcmp("\n", pch) != 0 && strcmp("\0", pch) != 0 ) {
+ se_gto_set_gtodev(ctx, pch);
+ }
+ } else if (strcmp("GTO_DEBUG", pch) == 0) {
+ pch = strtok(NULL, " =;");
+ ALOGD("SecureElement:%s Log state : %s", __func__, pch);
+ if (strlen(pch) > 0 && strcmp("\n", pch) != 0 && strcmp("\0", pch) != 0 ) {
+ if (strcmp(pch, "enable") == 0) {
+ debug_log_enabled = true;
+ se_gto_set_log_level(ctx, 4);
+ } else {
+ debug_log_enabled = false;
+ se_gto_set_log_level(ctx, 3);
+ }
+ }
}
-
}
return 0;
}
diff --git a/secure_element/1.1/SecureElement.cpp b/secure_element/1.1/SecureElement.cpp
index ca1c5e8..eb06ead 100644
--- a/secure_element/1.1/SecureElement.cpp
+++ b/secure_element/1.1/SecureElement.cpp
@@ -49,6 +49,7 @@
uint8_t getResponse[5] = {0x00, 0xC0, 0x00, 0x00, 0x00};
static struct se_gto_ctx *ctx;
+bool debug_log_enabled = false;
SecureElement::SecureElement(const char* ese_name){
nbrOpenChannel = 0;
@@ -100,7 +101,7 @@
return EXIT_FAILURE;
}
//settings = default_settings(ctx);
- se_gto_set_log_level(ctx, 4);
+ se_gto_set_log_level(ctx, 3);
openConfigFile(1);
@@ -586,6 +587,8 @@
int len = 0;
int input_len = n;
+ if (!debug_log_enabled) return;
+
msg = (char*) malloc ( (pf ? strlen(pf) : 0) + input_len * 3 + 1);
if(!msg) {
errno = ENOMEM;
@@ -674,13 +677,26 @@
continue;
}
- pch = strtok (s," =;");
- if (strcmp("GTO_DEV", pch) == 0){
- pch = strtok (NULL, " =;");
+ pch = strtok(s," =;");
+ if (strcmp("GTO_DEV", pch) == 0) {
+ pch = strtok(NULL, " =;");
ALOGD("SecureElement:%s Defined node : %s", __func__, pch);
- if (strlen (pch) > 0 && strcmp("\n",pch) != 0 && strcmp("\0",pch) != 0 ) se_gto_set_gtodev(ctx, pch);
+ if (strlen(pch) > 0 && strcmp("\n", pch) != 0 && strcmp("\0", pch) != 0 ) {
+ se_gto_set_gtodev(ctx, pch);
+ }
+ } else if (strcmp("GTO_DEBUG", pch) == 0) {
+ pch = strtok(NULL, " =;");
+ ALOGD("SecureElement:%s Log state : %s", __func__, pch);
+ if (strlen(pch) > 0 && strcmp("\n", pch) != 0 && strcmp("\0", pch) != 0 ) {
+ if (strcmp(pch, "enable") == 0) {
+ debug_log_enabled = true;
+ se_gto_set_log_level(ctx, 4);
+ } else {
+ debug_log_enabled = false;
+ se_gto_set_log_level(ctx, 3);
+ }
+ }
}
-
}
return 0;
}
diff --git a/secure_element/1.2/SecureElement.cpp b/secure_element/1.2/SecureElement.cpp
index 1c246bc..aa5a6be 100644
--- a/secure_element/1.2/SecureElement.cpp
+++ b/secure_element/1.2/SecureElement.cpp
@@ -53,6 +53,7 @@
uint8_t getResponse[5] = {0x00, 0xC0, 0x00, 0x00, 0x00};
static struct se_gto_ctx *ctx;
+bool debug_log_enabled = false;
SecureElement::SecureElement(const char* ese_name){
nbrOpenChannel = 0;
@@ -106,7 +107,7 @@
return EXIT_FAILURE;
}
//settings = default_settings(ctx);
- se_gto_set_log_level(ctx, 4);
+ se_gto_set_log_level(ctx, 3);
openConfigFile(1);
@@ -599,6 +600,8 @@
int len = 0;
int input_len = n;
+ if (!debug_log_enabled) return;
+
msg = (char*) malloc ( (pf ? strlen(pf) : 0) + input_len * 3 + 1);
if(!msg) {
errno = ENOMEM;
@@ -687,13 +690,26 @@
continue;
}
- pch = strtok (s," =;");
- if (strcmp("GTO_DEV", pch) == 0){
+ pch = strtok(s," =;");
+ if (strcmp("GTO_DEV", pch) == 0) {
pch = strtok (NULL, " =;");
ALOGD("SecureElement:%s Defined node : %s", __func__, pch);
- if (strlen (pch) > 0 && strcmp("\n",pch) != 0 && strcmp("\0",pch) != 0 ) se_gto_set_gtodev(ctx, pch);
+ if (strlen(pch) > 0 && strcmp("\n", pch) != 0 && strcmp("\0", pch) != 0 ) {
+ se_gto_set_gtodev(ctx, pch);
+ }
+ } else if (strcmp("GTO_DEBUG", pch) == 0) {
+ pch = strtok(NULL, " =;");
+ ALOGD("SecureElement:%s Log state : %s", __func__, pch);
+ if (strlen(pch) > 0 && strcmp("\n", pch) != 0 && strcmp("\0", pch) != 0 ) {
+ if (strcmp(pch, "enable") == 0) {
+ debug_log_enabled = true;
+ se_gto_set_log_level(ctx, 4);
+ } else {
+ debug_log_enabled = false;
+ se_gto_set_log_level(ctx, 3);
+ }
+ }
}
-
}
return 0;
}
diff --git a/secure_element/libse-gto-hal.conf b/secure_element/libse-gto-hal.conf
index 80e47c2..d34c850 100644
--- a/secure_element/libse-gto-hal.conf
+++ b/secure_element/libse-gto-hal.conf
@@ -1,2 +1,4 @@
#Gemalto SPI devnode
GTO_DEV=/dev/gto;
+#Set debug logs to enable/disable
+GTO_DEBUG=enable;
