Fix for 64bit UTC

Change-Id: Ib94b5c9cdbd1db3fb23f64b680c93b6332a7f243
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/common/src/account_key_handler.c b/common/src/account_key_handler.c
index 0f673f2b16e80b3f903db75f3d9df5b1e80e182d..eea61ba8374d58888f16ae94e8ce758b94cbc725 100644 (file)
--- a/common/src/account_key_handler.c
+++ b/common/src/account_key_handler.c
@@ -62,6 +62,8 @@ static int _get_app_mkey(unsigned char **mkey, int *mkey_len)
        _INFO("start _get_app_mkey");
 
        _INFO("before ckmc_get_data");
+       _INFO("_get_app_mkey : alias [%s], password [%s], strlen(password)", alias, password, strlen(password));
+
        ret = ckmc_get_data(alias, password, &mkey_buffer);
        _INFO("after ckmc_get_data");
        if (CKMC_ERROR_NONE != ret) {
@@ -124,6 +126,8 @@ static int _create_app_mkey(unsigned char **mkey, int *mkey_len)
        data.data = random;
        data.size = MKEY_LEN;
 
+       _INFO("_create_app_mkey : alias [%s], password [%s], MKEY_LEN [%d]", alias, policy.password, MKEY_LEN);
+
        _INFO("before ckmc_save_data");
        ret = ckmc_save_data(alias, data, policy);
        if (CKMC_ERROR_NONE != ret) {
@@ -148,7 +152,9 @@ static int _get_app_dek(char *mkey, const char *pkg_id, unsigned char **dek, int
        ckmc_raw_buffer_s *dek_buffer = NULL;
        char alias[128] = {0,};
 
-       snprintf(alias, sizeof(alias), "%s%s", ACCOUNT_MANAGER_DEK_ALIAS_PFX, pkg_id);
+       snprintf(alias, sizeof(alias) - 1, "%s%s", ACCOUNT_MANAGER_DEK_ALIAS_PFX, pkg_id);
+
+       _INFO("_get_app_dek : alias [%s], password [%s], strlen(password) [%d]", alias, password, strlen(password));
 
        ret = ckmc_get_data(alias, password, &dek_buffer);
        if (CKMC_ERROR_DB_ALIAS_UNKNOWN == ret) {
@@ -186,7 +192,7 @@ static int _create_app_dek(char *mkey, const char *pkg_id, unsigned char **dek,
 
        _INFO("start _create_app_dek");
 
-       snprintf(alias, sizeof(alias), "%s%s", ACCOUNT_MANAGER_DEK_ALIAS_PFX, pkg_id);
+       snprintf(alias, sizeof(alias) - 1, "%s%s", ACCOUNT_MANAGER_DEK_ALIAS_PFX, pkg_id);
 
        random = (unsigned char *)malloc(DEK_LEN);
        if (random == NULL) {
@@ -208,6 +214,7 @@ static int _create_app_dek(char *mkey, const char *pkg_id, unsigned char **dek,
        data.size = DEK_LEN;
 
        _INFO("before ckmc_save_data");
+       _INFO("_create_app_dek : alias [%s], password [%s], DEK_LEN [%d]", alias, policy.password, DEK_LEN);
        /* save app_dek in key_manager */
        ret = ckmc_save_data(alias, data, policy);
        if (CKMC_ERROR_NONE != ret) {
@@ -246,9 +253,9 @@ int account_key_handler_get_account_dek(const char *alias, unsigned char **accou
                }
        }
 
-       _INFO("before _get_app_mkey");
+       _INFO("before _get_app_dek");
        ret = _get_app_dek((char *)account_mkey, alias, account_dek, dek_len);
-       _INFO("after _get_app_mkey, ret=[%d]", ret);
+       _INFO("after _get_app_dek, ret=[%d]", ret);
        if (ret != CKMC_ERROR_NONE) {
                ret = _create_app_dek((char *)account_mkey, alias, account_dek, dek_len);
                if (ret != CKMC_ERROR_NONE) {
@@ -275,7 +282,7 @@ static int clear_test_keys(const char* pkg_id)
                return ret;
        }
 
-       snprintf(alias, sizeof(alias), "%s%s", ACCOUNT_MANAGER_DEK_ALIAS_PFX, pkg_id);
+       snprintf(alias, sizeof(alias) - 1, "%s%s", ACCOUNT_MANAGER_DEK_ALIAS_PFX, pkg_id);
        ret = ckmc_remove_alias(alias);
        if(CKMC_ERROR_NONE != ret) {
                return ret;

diff --git a/packaging/account-common.spec b/packaging/account-common.spec
index 41ac6e281c25cb2059302e9386cbf5325c72d66a..8df9ec124d9915c34a5ea757d4db546ef2dd2614 100644 (file)
--- a/packaging/account-common.spec
+++ b/packaging/account-common.spec
@@ -1,6 +1,6 @@
 Name:       account-common
 Summary:    Account common library
-Version:    0.1.3
+Version:    0.1.4
 Release:    1
 Group:      Social & Content/API
 License:    Apache-2.0