[APR-6839]libcharon: Provide a property option for rekeying

  [JIRA]: SOC-130596
  [Problem/Cause]: Depending on the carrier requirements,
    messages should be checked to confirm pass/fail in
    some test cases.
  [Solution]: Provide a property that shows the oriGin
    Session keys.

Change-Id: Ic5d28edf9c3ed805a020fff68c3662f6cc978c6e
Signed-off-by: Seongsik Kim <sz.kim@samsung.com>

diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk
index 3edd59484a4a8dd5be4c2ff3f22e1293813a3de5..59cde50d7989e0b5952896752bb336fd61a72b17 100755 (executable)
--- a/src/libcharon/Android.mk
+++ b/src/libcharon/Android.mk
@@ -155,9 +155,7 @@ LOCAL_SRC_FILES := $(filter %.c,$(libcharon_la_SOURCES))
 # adding the plugin source files
 
 LOCAL_SRC_FILES += $(call add_plugin, android-dns)
-ifneq ($(call plugin_enabled, android-dns),)
 LOCAL_SHARED_LIBRARIES += libcutils
-endif
 
 LOCAL_SRC_FILES += $(call add_plugin, android-log)
 ifneq ($(call plugin_enabled, android-log),)

diff --git a/src/libcharon/re_key/re_key.c b/src/libcharon/re_key/re_key.c
index a3f9ebb70cc10cd3241ffa2b92de12d446aaaa03..63c4746103284d841b4f054e66ae9faec9695e90 100644 (file)
--- a/src/libcharon/re_key/re_key.c
+++ b/src/libcharon/re_key/re_key.c
@@ -3,6 +3,7 @@
 #include <stdio.h>\r
 #include <utils/chunk.h>\r
 #include <utils/debug.h>\r
+#include <cutils/properties.h>\r
 \r
 #define REKEY_MAX_BYTE 256\r
 #define HEX_STR_LEN 4\r
@@ -10,6 +11,8 @@
 #define E_NUM 7\r
 #define N_NUM 407\r
 \r
+#define SHOW_KEY_PROPERTY "vendor.charon.showkey"\r
+\r
 /**\r
  * Computes a^b mod c\r
  */\r
@@ -29,13 +32,16 @@ int powmod(long long a, long long b, int c) {
  * Print Encrypt original secret codes\r
  */\r
 void rekey_secret_code(chunk_t *ori_chunk, char *key_name) {\r
-       char rekey_str[REKEY_MAX_BYTE] = {0};\r
-       char val[HEX_STR_LEN];\r
+       if (property_get_bool(SHOW_KEY_PROPERTY, 0)) {\r
+               DBG1(DBG_IKE, "%s secret %B", key_name, ori_chunk);\r
+       } else {\r
+               char rekey_str[REKEY_MAX_BYTE] = {0};\r
+               char temp_str[HEX_STR_LEN];\r
 \r
-       for(int i = 0; i < ori_chunk->len ; i++) {\r
-               sprintf(val,"%03d", powmod(ori_chunk->ptr[i], E_NUM, N_NUM) );\r
-               strncat(rekey_str, val, 3);\r
+               for(int i = 0; i < ori_chunk->len ; i++) {\r
+                       sprintf(temp_str, "%03d", powmod(ori_chunk->ptr[i], E_NUM, N_NUM));\r
+                       strncat(rekey_str, temp_str, 3);\r
+               }\r
+               DBG1(DBG_IKE, "%s : %s", key_name, rekey_str);\r
        }\r
-\r
-       DBG1(DBG_IKE, "%s : %s", key_name, rekey_str);\r
-}
\ No newline at end of file
+}\r