tizen id: remove dependency with libcryptsvc

- Previous: system-info uses libcryptsvc to get
       values with base 64 encoding. But libcryptscv
       is used by other apps and the apps can use
       system-info. So circular dependency problem
       can be occurred
- Now: system-info uses glib fot base 64 encoding.

Change-Id: I33819041e305db6d2210d08f8e9aec7b515a8365
Signed-off-by: Taeyoung Kim <ty317.kim@samsung.com>

diff --git a/packaging/capi-system-info.spec b/packaging/capi-system-info.spec
index 61638e3..9d21cc7 100644 (file)
--- a/packaging/capi-system-info.spec
+++ b/packaging/capi-system-info.spec
@@ -15,7 +15,7 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(cryptsvc)
+BuildRequires:  pkgconfig(glib-2.0)
 %if %{with wayland}
 BuildRequires:  pkgconfig(ecore-wayland)
 %endif
@@ -78,6 +78,8 @@ ln -s ../tizenid.service %{buildroot}%{_libdir}/systemd/system/multi-user.target
 %license LICENSE.APLv2
 %{_libdir}/libcapi-system-info.so.*
 %attr(0744,root,-) /etc/make_info_file.sh
+
+#tizenid
 %{_bindir}/tizen_id
 %{_libdir}/systemd/system/tizenid.service
 %{_libdir}/systemd/system/multi-user.target.wants/tizenid.service

diff --git a/src/tizenid/CMakeLists.txt b/src/tizenid/CMakeLists.txt
index 8ea9d4c..6fdaf6a 100755 (executable)
--- a/src/tizenid/CMakeLists.txt
+++ b/src/tizenid/CMakeLists.txt
@@ -10,8 +10,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE(FindPkgConfig)
 pkg_check_modules(tizenid_pkgs REQUIRED
                dlog
+               glib-2.0
                openssl
-               cryptsvc
 )
 
 FOREACH(flag ${tizenid_pkgs_CFLAGS})

diff --git a/src/tizenid/tizenid.c b/src/tizenid/tizenid.c
index 3c194a6..95c15f3 100755 (executable)
--- a/src/tizenid/tizenid.c
+++ b/src/tizenid/tizenid.c
@@ -29,7 +29,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <dlog.h>
-#include <SecCryptoSvc.h>
+#include <glib.h>
 
 #ifdef LOG_TAG
 #undef LOG_TAG
@@ -154,7 +154,8 @@ static int store_tizen_id(char *id)
 static int make_tizen_id(void)
 {
        char salt[KEY_MAX], pw_key[KEY_MAX];
-       char *id = NULL, *id_64 = NULL;
+       char *id = NULL;
+       gchar *id_64 = NULL;
        int ret;
 
        ret = get_salt_by_model(salt, sizeof(salt));
@@ -188,7 +189,7 @@ static int make_tizen_id(void)
        id[KEY_MAX-1] = '\0';
        _I("ID: (%s)", id);
 
-       id_64 = Base64Encoding(id, KEY_MAX);
+       id_64 = g_base64_encode((const guchar *)id, KEY_MAX);
 
        ret = store_tizen_id(id_64);
        if (ret < 0) {
@@ -202,7 +203,7 @@ out:
        if (id)
                free(id);
        if (id_64)
-               free(id_64);
+               g_free(id_64);
 
        return ret;
 }