Apply secure-storage data migration

Change-Id: I5f6196eb99f92f416cb619f7f0b9d7a2fafc249b
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/packaging/tel-plugin-imc.spec b/packaging/tel-plugin-imc.spec
index 359468d..f0a0f5a 100755 (executable)
--- a/packaging/tel-plugin-imc.spec
+++ b/packaging/tel-plugin-imc.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 91
+%define patchlevel 92
 
 Name:             tel-plugin-imc
 Version:          %{major}.%{minor}.%{patchlevel}

diff --git a/src/imc_sim.c b/src/imc_sim.c
index 11751f0..a5ee4b1 100644 (file)
--- a/src/imc_sim.c
+++ b/src/imc_sim.c
@@ -43,7 +43,7 @@
 #define SIM_PIN_MAX_RETRY_COUNT         3
 #define SMS_STATE_READY        1
 
-#define SIM_STORE_KEY "telephony_sim_imsi1"
+#define SIM_IMSI1_DATA_KEY "imsi1"
 
 #define SWAPBYTES16(x) \
        { \
@@ -448,22 +448,6 @@ static enum tel_sim_access_result _decode_status_word(unsigned short status_word
        return rst;
 }
 
-static char *_add_shared_owner_prefix(const char *name)
-{
-       size_t alias_len = strlen(name) + strlen(ckmc_owner_id_system) + strlen(ckmc_owner_id_separator);
-       char *ckm_alias = (char *)malloc(alias_len + 1);
-       if (!ckm_alias) {
-               err("Failed to allocate memory");
-               return NULL;
-       }
-       memset(ckm_alias, 0, alias_len);
-       strncat(ckm_alias, ckmc_owner_id_system, strlen(ckmc_owner_id_system));
-       strncat(ckm_alias, ckmc_owner_id_separator, strlen(ckmc_owner_id_separator));
-       strncat(ckm_alias, name, strlen(name));
-
-       return ckm_alias;
-}
-
 static gboolean _sim_check_identity(CoreObject *co_sim, struct tel_sim_imsi *imsi)
 {
        gboolean is_changed = TRUE;
@@ -482,9 +466,9 @@ static gboolean _sim_check_identity(CoreObject *co_sim, struct tel_sim_imsi *ims
                return FALSE;
        }
 
-       alias = _add_shared_owner_prefix(SIM_STORE_KEY);
-       if (alias == NULL) {
-               err("Failed to allocate alias name.");
+       ret_val = ckmc_alias_new(ckmc_owner_id_system, SIM_IMSI1_DATA_KEY, &alias);
+       if (ret_val != CKMC_ERROR_NONE || alias == NULL) {
+               err("Failed to create alias name.");
                return FALSE;
        }