Changed FacetId rule to Signer certificate

Change-Id: Ib638731120c018b91a264d15b53901c60511da0d
Signed-off-by: Manasij Sur Roy <manasij.r@samsung.com>

diff --git a/common/fido_json_handler.c b/common/fido_json_handler.c
index 130c36b..fc75258 100644 (file)
--- a/common/fido_json_handler.c
+++ b/common/fido_json_handler.c
@@ -2016,20 +2016,22 @@ _uaf_composer_compose_final_challenge(const char *app_id, const char *challenge,
                if (chb_root_obj == NULL)
                        return NULL;
 
-               char *end_pt = (char*)json_object_get_string_member(chb_root_obj, _JSON_KEY_SERVER_END_POINT);
-               char *cert = (char*)json_object_get_string_member(chb_root_obj, _JSON_KEY_TLS_SERVER_CERT);
-               char *uni = (char*)json_object_get_string_member(chb_root_obj, _JSON_KEY_TLS_UNIQUE);
-               char *cid = (char*)json_object_get_string_member(chb_root_obj, _JSON_KEY_CID_PUB_KEY);
+               const gchar *end_pt = json_object_get_string_member(chb_root_obj, _JSON_KEY_SERVER_END_POINT);
+               const gchar *cert = json_object_get_string_member(chb_root_obj, _JSON_KEY_TLS_SERVER_CERT);
+               const gchar *uni = json_object_get_string_member(chb_root_obj, _JSON_KEY_TLS_UNIQUE);
+               const gchar *cid = json_object_get_string_member(chb_root_obj, _JSON_KEY_CID_PUB_KEY);
 
-               json_object_set_string_member(jsonObject, _JSON_KEY_SERVER_END_POINT, end_pt);
-               json_object_set_string_member(jsonObject, _JSON_KEY_TLS_SERVER_CERT, cert);
-               json_object_set_string_member(jsonObject, _JSON_KEY_TLS_UNIQUE, uni);
-               json_object_set_string_member(jsonObject, _JSON_KEY_CID_PUB_KEY, cid);
+               if (end_pt != NULL)
+                       json_object_set_string_member(jsonObject, _JSON_KEY_SERVER_END_POINT, end_pt);
 
-               SAFE_DELETE(end_pt);
-               SAFE_DELETE(cert);
-               SAFE_DELETE(uni);
-               SAFE_DELETE(cid);
+               if (cert != NULL)
+                       json_object_set_string_member(jsonObject, _JSON_KEY_TLS_SERVER_CERT, cert);
+
+               if (uni != NULL)
+                       json_object_set_string_member(jsonObject, _JSON_KEY_TLS_UNIQUE, uni);
+
+               if (cid != NULL)
+                       json_object_set_string_member(jsonObject, _JSON_KEY_CID_PUB_KEY, cid);
 
                g_object_unref(chb_parser);
        }

diff --git a/server/fido_app_id_handler.c b/server/fido_app_id_handler.c
index 290a034..ffd3bc0 100644 (file)
--- a/server/fido_app_id_handler.c
+++ b/server/fido_app_id_handler.c
@@ -510,7 +510,7 @@ __get_tz_facet_id_of_caller(const char *caller_app_id, GDBusMethodInvocation *in
 
        _INFO("");
 
-       ret = pkgmgrinfo_pkginfo_get_cert_value(cert_handle, PMINFO_AUTHOR_ROOT_CERT, &author_cert);
+       ret = pkgmgrinfo_pkginfo_get_cert_value(cert_handle, PMINFO_AUTHOR_SIGNER_CERT, &author_cert);
        if (ret != PMINFO_R_OK) {
                pkgmgrinfo_pkginfo_destroy_certinfo(cert_handle);
                _ERR("");