remove unnecessary log prints

Change-Id: I627f6d9093805bcbc3d149ac87ff2c21588af22a

diff --git a/common/fido_json_handler.c b/common/fido_json_handler.c
index fc75258..bb2a680 100644 (file)
--- a/common/fido_json_handler.c
+++ b/common/fido_json_handler.c
@@ -623,7 +623,6 @@ __get_int_list_from_json_array(JsonArray *json_arr)
 static _match_criteria_t*
 _uaf_parser_parse_match(JsonObject *match_obj)
 {
-       _INFO("_uaf_parser_parse_match");
 
        if (match_obj != NULL) {
 
@@ -667,12 +666,9 @@ _uaf_parser_parse_match(JsonObject *match_obj)
 
                match_criteria->auth_version = __get_int_from_json_object(match_obj, _JSON_KEY_AUTH_VERSION);
 
-               _INFO("_uaf_parser_parse_match is returning match_criteria");
-
                return match_criteria;
        }
 
-       _INFO("_uaf_parser_parse_match is returning NULL");
        return NULL;
 }
 
@@ -680,8 +676,6 @@ static GList*
 __get_plte_list(JsonObject *png_json_obj)
 {
 
-       _INFO("");
-
        GList *plte_list_priv = NULL;
 
        JsonArray *plte_json_arr = json_object_get_array_member(png_json_obj, "plte");
@@ -713,7 +707,6 @@ __get_plte_list(JsonObject *png_json_obj)
 
        plte_list_priv = g_list_first(plte_list_priv);
 
-       _INFO("");
 
        return plte_list_priv;
 }
@@ -723,8 +716,6 @@ __get_png_data(JsonObject *png_json_obj)
 {
        RET_IF_FAIL(png_json_obj != NULL, NULL);
 
-       _INFO("");
-
        fido_display_png_characteristics_descriptor_s *png_data = (fido_display_png_characteristics_descriptor_s*)
                        calloc(1, sizeof(fido_display_png_characteristics_descriptor_s));
 
@@ -738,7 +729,6 @@ __get_png_data(JsonObject *png_json_obj)
 
        png_data->plte = __get_plte_list(png_json_obj);
 
-       _INFO("");
        return png_data;
 }
 
@@ -2678,7 +2668,6 @@ __get_policy(JsonObject *uaf_object)
        RET_IF_FAIL(accepted_array != NULL, NULL);
 
        int accepted_len = json_array_get_length(accepted_array);
-       _INFO("Parser accepted list count [%d]", accepted_len);
 
        _policy_t *policy_info = (_policy_t *)calloc(1, sizeof(_policy_t));
        policy_info->is_keyid_present = false;
@@ -2691,7 +2680,6 @@ __get_policy(JsonObject *uaf_object)
                JsonArray *accepted_arr_inner = json_array_get_array_element(accepted_array, i);
                if (accepted_arr_inner) {
                        int accepted_len_inner = json_array_get_length(accepted_arr_inner);
-                       _INFO("Parser accepted list inner count [%d]", accepted_len_inner);
 
                        int j = 0;
                        for (j = 0; j < accepted_len_inner; j++) {
@@ -2701,7 +2689,6 @@ __get_policy(JsonObject *uaf_object)
                                if (match_obj) {
                                        _match_criteria_t *match_info = _uaf_parser_parse_match(match_obj);
                                        if (match_info) {
-                                               _INFO("Appending match_info");
                                                if (policy_info->is_keyid_present == false) {
                                                        if (match_info->key_id_list != NULL)
                                                                policy_info->is_keyid_present = true;
@@ -2711,7 +2698,6 @@ __get_policy(JsonObject *uaf_object)
                                }
                                if (j == (accepted_len_inner - 1)) {
                                        if (allowed_list_inner) {
-                                               _INFO("Appending accepted list");
                                                allowed_list = g_list_append(allowed_list, allowed_list_inner);
                                        }
                                }
@@ -2747,7 +2733,6 @@ __get_policy(JsonObject *uaf_object)
                        policy_info->disallowed_list = g_list_first(disallowed_list);
        }
 
-       _INFO("returning policy [%p]", policy_info);
        return policy_info;
 }
 
@@ -2777,7 +2762,6 @@ __get_transaction_list(JsonObject *uaf_obj)
        JsonArray *tr_arr = json_object_get_array_member(uaf_obj, _JSON_KEY_TRANSACTION);
        RET_IF_FAIL(tr_arr != NULL, NULL);
 
-       _INFO("");
 
        GList *trans_list = NULL;
 
@@ -2806,7 +2790,6 @@ __get_transaction_list(JsonObject *uaf_obj)
                _INFO("Transaction list count = [%d]", g_list_length(trans_list));
        }
 
-       _INFO("");
        return trans_list;
 }
 
@@ -3153,8 +3136,6 @@ _uaf_parser_parser_asm_get_reg_response(const char *get_reg_resp)
        gboolean is_parsed = json_parser_load_from_data(parser, get_reg_resp, -1, &parser_err);
        RET_IF_FAIL(is_parsed == TRUE, NULL);
 
-       _INFO("");
-
        _asm_get_reg_out_t *reg_out = NULL;
 
        JsonNode *root = json_parser_get_root(parser);
@@ -3163,8 +3144,6 @@ _uaf_parser_parser_asm_get_reg_response(const char *get_reg_resp)
        JsonObject *root_obj = json_node_get_object(root);
        CATCH_IF_FAIL(root_obj != NULL);
 
-       _INFO("");
-
        /*responseData*/
        JsonObject *res_obj = json_object_get_object_member(root_obj, _JSON_KEY_RESP_DATA);
        CATCH_IF_FAIL(res_obj != NULL);
@@ -3173,8 +3152,6 @@ _uaf_parser_parser_asm_get_reg_response(const char *get_reg_resp)
        JsonArray *app_reg_json_arr = json_object_get_array_member(res_obj, _JSON_KEY_APP_REGS);
        CATCH_IF_FAIL(app_reg_json_arr != NULL);
 
-       _INFO("");
-
        int app_reg_json_arr_len = json_array_get_length(app_reg_json_arr);
        CATCH_IF_FAIL(app_reg_json_arr_len > 0);
 
@@ -3187,8 +3164,6 @@ _uaf_parser_parser_asm_get_reg_response(const char *get_reg_resp)
                        /*appID*/
                        const char *app_id = json_object_get_string_member(app_reg_json_obj, _JSON_KEY_APPID);
 
-                       _INFO("");
-
                        /*keyIDs*/
                        JsonArray *key_id_json_arr = json_object_get_array_member(app_reg_json_obj, _JSON_KEY_KEY_IDS);
                        GList *key_id_list = __get_string_list_from_json_array(key_id_json_arr);
@@ -3205,13 +3180,10 @@ _uaf_parser_parser_asm_get_reg_response(const char *get_reg_resp)
                                __print_string_list(key_id_list);
 
                                reg_out->app_reg_list = g_list_append(reg_out->app_reg_list, app_reg);
-                               _INFO("");
-
                        }
                }
        }
 
-       _INFO("");
        /*statusCode*/
        reg_out->status_code = __get_int_from_json_object(root_obj, _JSON_KEY_STATUS_CODE);
 

diff --git a/common/fido_uaf_utils.c b/common/fido_uaf_utils.c
index 6a2ebf5..7bd7d3d 100644 (file)
--- a/common/fido_uaf_utils.c
+++ b/common/fido_uaf_utils.c
@@ -23,30 +23,24 @@
 void
 _free_extension(_extension_t *data)
 {
-       _INFO("");
-
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->id);
        SAFE_DELETE(data->data);
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 static void
 _free_extension_list_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_extension((_extension_t*)data);
-       _INFO("");
 }
 
 void
 _free_match_criteria(_match_criteria_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        if (data->aaid_list != NULL)
@@ -71,45 +65,37 @@ _free_match_criteria(_match_criteria_t *data)
                g_list_free_full(data->extension_list, _free_extension_list_item);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 static void
 _free_uaf_accepted_list_inner_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_match_criteria((_match_criteria_t*)data);
-       _INFO("");
 }
 
 static void
 _free_uaf_accepted_list_outer_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        GList *list = (GList*)data;
        if (list != NULL)
                g_list_free_full(list, _free_uaf_accepted_list_inner_item);
-       _INFO("");
 }
 
 static void
 _free_uaf_disallowed_list_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_match_criteria((_match_criteria_t*)data);
-       _INFO("");
 }
 
 void
 _free_policy(_policy_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        if (data->accepted_list != NULL)
@@ -119,13 +105,11 @@ _free_policy(_policy_t *data)
                g_list_free_full(data->disallowed_list, _free_uaf_disallowed_list_item);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_op_header(_op_header_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->version);
@@ -137,13 +121,11 @@ _free_op_header(_op_header_t *data)
                g_list_free_full(data->ext_list, _free_extension_list_item);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_message(_message_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->facet_id);
@@ -171,13 +153,11 @@ _free_message(_message_t *data)
        }
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_reg_request(_reg_request_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->challenge);
@@ -186,26 +166,22 @@ _free_reg_request(_reg_request_t *data)
        _free_policy(data->policy);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_display_png_characteristics_descriptor(fido_display_png_characteristics_descriptor_s *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        if (data->plte != NULL)
                g_list_free_full(data->plte, free);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_auth_transaction(_auth_transaction_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->content);
@@ -214,23 +190,19 @@ _free_auth_transaction(_auth_transaction_t *data)
        _free_display_png_characteristics_descriptor(data->display_charac);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 static void
 __free_auth_transaction_list_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_auth_transaction((_auth_transaction_t*)data);
-       _INFO("");
 }
 
 void
 _free_auth_request(_auth_request_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->challenge);
@@ -241,61 +213,51 @@ _free_auth_request(_auth_request_t *data)
                g_list_free_full(data->transaction_list, __free_auth_transaction_list_item);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_dereg_auth_info(_dereg_auth_info_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->aaid);
        SAFE_DELETE(data->key_id);
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 static void
 __free_dereg_auth_info_list_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_dereg_auth_info((_dereg_auth_info_t*)data);
-       _INFO("");
 }
 
 void
 _free_dereg_request(_dereg_request_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        if (data->auth_info_list != NULL)
                g_list_free_full(data->auth_info_list, __free_dereg_auth_info_list_item);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_asm_display_png_characteristics_descriptor_t(_fido_asm_display_png_characteristics_descriptor_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        if (data->plte != NULL)
                g_list_free_full(data->plte, free);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_fido_asm_proxy(void *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _fido_asm_proxy_t *data_impl = (_fido_asm_proxy_t*)data;
@@ -310,77 +272,57 @@ _free_fido_asm_proxy(void *data)
        g_object_unref(data_impl->dbus_proxy);
 
        SAFE_DELETE(data_impl);
-
-       _INFO("");
 }
 
 void
 _free_asm_discover_response(_asm_discover_response_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->asm_id);
        SAFE_DELETE(data->asm_response_json);
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_fido_asm_authenticator(fido_authenticator_s *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->asm_id);
 
-       _INFO("");
-
        SAFE_DELETE(data->auth_index);
 
-       _INFO("");
-
        if (data->key_ids != NULL)
                g_list_free_full(data->key_ids, free);
-       _INFO("");
 
        /*TODO : asm_versions is not used anywhere*/
 
        SAFE_DELETE(data->aaid);
-       _INFO("");
 
        SAFE_DELETE(data->assertion_scheme);
-       _INFO("");
 
        if (data->attestation_types != NULL)
                g_list_free(data->attestation_types);
-       _INFO("");
 
        if (data->supported_extension_IDs != NULL)
                g_list_free_full(data->supported_extension_IDs, free);
-       _INFO("");
 
        SAFE_DELETE(data->tc_display_content_type);
-       _INFO("");
 
        if (data->tc_display_png_characteristics != NULL)
                g_list_free_full(data->tc_display_png_characteristics, _free_tc_disp_png_char);
-       _INFO("");
 
        SAFE_DELETE(data->title);
-       _INFO("");
 
        SAFE_DELETE(data->description);
-       _INFO("");
 
        SAFE_DELETE(data->icon);
-       _INFO("");
 
        if (data->supported_versions != NULL)
                g_list_free_full(data->supported_versions, free);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
@@ -396,43 +338,36 @@ _free_fido_asm_authenticator_list_item(gpointer data)
 void
 _free_fido_asm_reg_in(_fido_asm_reg_in_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->app_id);
        SAFE_DELETE(data->user_name);
        SAFE_DELETE(data->final_challenge);
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_fido_asm_transaction(_fido_asm_transaction_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->content);
        SAFE_DELETE(data->content_type);
        _free_asm_display_png_characteristics_descriptor_t(data->display_charac);
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 static void
 __free_fido_asm_transaction_list_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_fido_asm_transaction((_fido_asm_transaction_t *)data);
-       _INFO("");
 }
 
 void
 _free_fido_asm_auth_in(_fido_asm_auth_in_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->app_id);
@@ -444,26 +379,22 @@ _free_fido_asm_auth_in(_fido_asm_auth_in_t *data)
                g_list_free_full(data->trans_list, __free_fido_asm_transaction_list_item);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_fido_asm_dereg_in(_fido_asm_dereg_in_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->app_id);
        SAFE_DELETE(data->key_id);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_ui_auth_data(_ui_auth_data_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->asm_id);
@@ -471,36 +402,30 @@ _free_ui_auth_data(_ui_auth_data_t *data)
        SAFE_DELETE(data->label);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_auth_reg_assertion(_auth_reg_assertion_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->assertion_schm);
        SAFE_DELETE(data->assertion);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_auth_reg_assertion_list_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_auth_reg_assertion((_auth_reg_assertion_t*)data);
-       _INFO("");
 }
 
 void
 _free_asm_out(_asm_out_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        switch (data->type) {
@@ -520,53 +445,43 @@ _free_asm_out(_asm_out_t *data)
        if (data->ext_list != NULL) {
                _INFO("Freeing ext list");
                g_list_free_full(data->ext_list, free);
-               _INFO("After Freeing ext list");
        }
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_asm_reg_out(_asm_reg_out_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->assertion);
        SAFE_DELETE(data->assertion_schm);
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_asm_auth_out(_asm_auth_out_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->assertion);
        SAFE_DELETE(data->assertion_scheme);
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_tlv(_tlv_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->val);
        SAFE_DELETE(data);
-
-       _INFO("");
 }
 
 void
 _free_tc_disp_png_char(gpointer data)
 {
-       _INFO("");
        if (data == NULL)
                return;
 
@@ -575,27 +490,22 @@ _free_tc_disp_png_char(gpointer data)
                g_list_free_full(png->plte, free);
 
        SAFE_DELETE(png);
-       _INFO("");
 }
 
 void
 _free_asm_auth_list(gpointer data)
 {
-       _INFO("_free_asm_auth_list start");
 
        if (data == NULL)
                return;
 
        _free_fido_asm_authenticator((fido_authenticator_s*)data);
 
-       _INFO("_free_asm_auth_list end");
-
 }
 
 void
 _free_matched_auth_dereg(_matched_auth_dereg_t *data)
 {
-       _INFO("_free_matched_auth_dereg start");
        if (data == NULL)
                return;
 
@@ -605,13 +515,11 @@ _free_matched_auth_dereg(_matched_auth_dereg_t *data)
        SAFE_DELETE(data->key_id);
 
        SAFE_DELETE(data);
-       _INFO("_free_matched_auth_dereg end");
 }
 
 void
 _free_asm_app_reg(_asm_app_reg_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->app_id);
@@ -620,49 +528,41 @@ _free_asm_app_reg(_asm_app_reg_t *data)
                g_list_free_full(data->key_id_list, free);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 static void
 __free_asm_app_reg_list_item(gpointer data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_asm_app_reg((_asm_app_reg_t*)data);
-       _INFO("");
 }
 
 void
 _free_asm_get_reg_out(_asm_get_reg_out_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        if (data->app_reg_list != NULL)
                g_list_free_full(data->app_reg_list, __free_asm_app_reg_list_item);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_auth_reg_assertion_tlv(_auth_reg_assertion_tlv_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->aaid);
        SAFE_DELETE(data->key_id);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_response(_response_t *data)
 {
-       _INFO("");
        RET_IF_FAIL_VOID(data != NULL);
 
        _free_op_header(data->header);
@@ -672,13 +572,11 @@ _free_response(_response_t *data)
                g_list_free_full(data->assertion_list, _free_auth_reg_assertion_list_item);
 
        SAFE_DELETE(data);
-       _INFO("");
 }
 
 void
 _free_matched_auth_data(gpointer data)
 {
-       _INFO("_free_matched_auth_data start");
        if (data == NULL)
                return;
 
@@ -688,6 +586,4 @@ _free_matched_auth_data(gpointer data)
        SAFE_DELETE(match_auth_data->auth_index);
        SAFE_DELETE(match_auth_data->label);
        SAFE_DELETE(match_auth_data);
-
-       _INFO("_free_matched_auth_data end");
 }

diff --git a/server/fido_app_id_handler.c b/server/fido_app_id_handler.c
index c994d08..90637ea 100644 (file)
--- a/server/fido_app_id_handler.c
+++ b/server/fido_app_id_handler.c
@@ -206,8 +206,6 @@ __get_uid_of_dbus_caller(GDBusMethodInvocation *invocation)
 const char*
 __get_pub_key(const char *json_id_str)
 {
-       _INFO("__get_pub_key starting");
-
        RET_IF_FAIL(json_id_str != NULL, NULL);
 
 
@@ -232,8 +230,6 @@ __get_pub_key(const char *json_id_str)
        char *pub_key = strtok_r(NULL, ":", &save_ptr);
        RET_IF_FAIL(pub_key != NULL, NULL);
 
-       _INFO("__get_pub_key end");
-
        return pub_key;
 }
 
@@ -297,22 +293,17 @@ CATCH:
 static void
 _free_app_id_cb_data(_app_id_cb_data_t* data)
 {
-       _INFO("");
-
        RET_IF_FAIL_VOID(data != NULL);
 
        SAFE_DELETE(data->real_app_id);
        SAFE_DELETE(data->caller_app_id);
 
        SAFE_DELETE(data);
-
-       _INFO("");
 }
 
 static gboolean
 __timer_expired(gpointer data)
 {
-       _INFO("__timer_expired");
        _app_id_cb_data_t *cb_data = (_app_id_cb_data_t*)data;
        (cb_data->cb)(FIDO_ERROR_NONE, cb_data->real_app_id, cb_data->user_data);
 
@@ -361,8 +352,6 @@ __b64_decode(const char *encoded_data, int encoded_size, unsigned char **decoded
 {
        RET_IF_FAIL(encoded_data != NULL, -1);
 
-       //_INFO("%s", encoded_data);
-
        int len = 0;
        *decoded_size = encoded_size;
 
@@ -377,14 +366,11 @@ __b64_decode(const char *encoded_data, int encoded_size, unsigned char **decoded
        bmem = BIO_push(bioCmd, bmem);
 
        len = BIO_read(bmem, (void *) (*decoded_data), (*decoded_size));
-       _INFO("%d", len);
 
        *decoded_size = len;
 
        BIO_free_all(bmem);
 
-       _INFO("");
-
        return 0;
 }
 
@@ -505,8 +491,6 @@ __get_tz_facet_id_of_caller(const char *caller_app_id, GDBusMethodInvocation *in
                return NULL;
        }
 
-       _INFO("");
-
        /*char *pkgid = NULL;
        ret = pkgmgrinfo_pkginfo_get_pkgid(handle, &pkgid);
        if (ret != PMINFO_R_OK) {
@@ -527,8 +511,6 @@ __get_tz_facet_id_of_caller(const char *caller_app_id, GDBusMethodInvocation *in
                return NULL;
        }
 
-       _INFO("");
-
 #ifdef WITH_JSON_BUILDER
        ret = pkgmgrinfo_pkginfo_load_certinfo(caller_pkg_id, cert_handle, uid);
 #else
@@ -544,8 +526,6 @@ __get_tz_facet_id_of_caller(const char *caller_app_id, GDBusMethodInvocation *in
                return NULL;
        }
 
-       _INFO("");
-
        ret = pkgmgrinfo_pkginfo_get_cert_value(cert_handle, PMINFO_AUTHOR_SIGNER_CERT, &author_cert);
        _INFO("pkgmgrinfo_pkginfo_get_cert_value = [%d]", ret);
        if (ret != PMINFO_R_OK) {
@@ -557,39 +537,31 @@ __get_tz_facet_id_of_caller(const char *caller_app_id, GDBusMethodInvocation *in
 
        _INFO("Author Signer Cert=%s", author_cert);
 
-       _INFO("");
-
        char *author_cert_hash = NULL;
        char *tz_facet_id = NULL;
        int tz_facet_id_max_len = -1;
 
 
        author_cert_hash = __get_pub_key_from_cert(author_cert);
-       _INFO("");
+
        CATCH_IF_FAIL(author_cert_hash != NULL);
 
        tz_facet_id_max_len = strlen(author_cert_hash) + 128;
        tz_facet_id = (char*)(calloc(1, tz_facet_id_max_len));
        snprintf(tz_facet_id, tz_facet_id_max_len, "%s:%s", "tizen:pkg-key-hash",
                         author_cert_hash);
-       _INFO("");
-
 
 CATCH:
-       _INFO("Before return");
-
        pkgmgrinfo_pkginfo_destroy_certinfo(cert_handle);
        pkgmgrinfo_pkginfo_destroy_pkginfo(handle);
        pkgmgrinfo_appinfo_destroy_appinfo(pkg_app_info);
-       _INFO("");
+
        return tz_facet_id;
 }
 
 int
 _verify_and_get_facet_id(const char *uaf_app_id, GDBusMethodInvocation *invocation, _facet_id_cb cb, void *user_data)
 {
-       _INFO("_verify_and_get_facet_id");
-
        char *app_id = __get_appid_of_dbus_caller(invocation);
        if (app_id == NULL)
                return FIDO_ERROR_PERMISSION_DENIED;
@@ -613,7 +585,7 @@ _verify_and_get_facet_id(const char *uaf_app_id, GDBusMethodInvocation *invocati
 
        /*Case 1: UAF JSON does not have appID, so no check is required, put facetid*/
        if (uaf_app_id == NULL) {
-               _INFO("UAF msg does not have appID");
+               _DBG("UAF msg does not have appID");
                cb_data->real_app_id = __get_tz_facet_id_of_caller(app_id, invocation);
                g_timeout_add(2, __timer_expired, cb_data);
                return FIDO_ERROR_NONE;
@@ -621,7 +593,7 @@ _verify_and_get_facet_id(const char *uaf_app_id, GDBusMethodInvocation *invocati
 
        /*Case 2: Try assuming UAF JSON is not URL, so string comparison check is required*/
        if (strcmp(cb_data->caller_app_id, uaf_app_id) == 0) {
-               _INFO("UAF msg has direct appID");
+               _DBG("UAF msg has direct appID");
 
                cb_data->real_app_id = strdup(uaf_app_id);
                g_timeout_add(2, __timer_expired, cb_data);

diff --git a/server/fido_selection_ui_adaptor.c b/server/fido_selection_ui_adaptor.c
index cf0ceab..1a7cc94 100644 (file)
--- a/server/fido_selection_ui_adaptor.c
+++ b/server/fido_selection_ui_adaptor.c
@@ -469,8 +469,6 @@ __get_proc_path_of_dbus_caller(GDBusMethodInvocation *invocation)
 gboolean
 _auth_ui_selector_on_ui_response(Fido *object, GDBusMethodInvocation *invocation, int error, const char *ui_resp)
 {
-       _INFO("");
-
        char *caller = __get_proc_path_of_dbus_caller(invocation);
        if (caller == NULL) {
                _ERR("__get_proc_path_of_dbus_caller failed");

diff --git a/server/fido_server.c b/server/fido_server.c
index c0c5986..b205944 100755 (executable)
--- a/server/fido_server.c
+++ b/server/fido_server.c
@@ -410,8 +410,6 @@ _asm_response_reg_process(int error_code, const char *asm_response_json, void *u
 static void
 __handle_reg(_process_cb_data_t *cb_data, _matched_auth_data_t *matched_auth)
 {
-       _INFO("");
-
        _message_t *uaf_req = (_message_t *)(cb_data->uaf_req);
 
        _reg_request_t *uaf_reg_req = (_reg_request_t *)(cb_data->uaf_req->data);
@@ -440,8 +438,6 @@ __handle_reg(_process_cb_data_t *cb_data, _matched_auth_data_t *matched_auth)
        if (uaf_reg_req->user_name != NULL)
                reg_in->user_name = strdup(uaf_reg_req->user_name);
 
-       _INFO("");
-
        char *fc_json = _uaf_composer_compose_final_challenge(reg_in->app_id, uaf_reg_req->challenge,
                                                                                                                  uaf_req->facet_id, cb_data->uaf_req->channel_binding);
 
@@ -452,7 +448,6 @@ __handle_reg(_process_cb_data_t *cb_data, _matched_auth_data_t *matched_auth)
                return;
        }
 
-       _INFO("");
        /* Final challenge */
        reg_in->final_challenge = fc_json;
 
@@ -469,7 +464,6 @@ __handle_reg(_process_cb_data_t *cb_data, _matched_auth_data_t *matched_auth)
 
        cb_data->asm_in = reg_in;
 
-       _INFO("");
        int ret = _uaf_composer_compose_asm_reg_request(version, auth_idx_int, reg_in, &asm_req_json);
        if (ret == 0 && asm_req_json != NULL)
                _asm_ipc_send(matched_auth->asm_id,
@@ -542,8 +536,6 @@ __copy_convert_uaf_trans_list(GList *uaf_tr_list)
 static GList*
 __copy_string_list(GList *src)
 {
-       _INFO("");
-
        RET_IF_FAIL(src != NULL, NULL);
 
        GList *dest = NULL;
@@ -554,10 +546,8 @@ __copy_string_list(GList *src)
                dest = g_list_append(dest, strdup(str));
 
                iter = iter->next;
-               _INFO("");
        }
 
-       _INFO("");
        return dest;
 }
 
@@ -996,11 +986,9 @@ _discover_response_cb_for_process(int tz_error_code, int error_code, GList *avai
                return;
        }
 
-       _INFO("");
        allowed_auth_list = g_list_first(allowed_auth_list);
 
        if (g_list_length(allowed_auth_list) > 1) {
-               _INFO("");
 
                GList *ui_data_list = NULL;
 
@@ -1036,7 +1024,6 @@ _discover_response_cb_for_process(int tz_error_code, int error_code, GList *avai
                        return;
                }
        } else {
-               _INFO("");
                GList *allowed_auth_list_iter = allowed_auth_list;
                _matched_auth_data_t *match_data = (_matched_auth_data_t *)(allowed_auth_list_iter->data);
 

diff --git a/server/fido_uaf_policy_checker.c b/server/fido_uaf_policy_checker.c
index e0d3cd9..dea204b 100644 (file)
--- a/server/fido_uaf_policy_checker.c
+++ b/server/fido_uaf_policy_checker.c
@@ -50,7 +50,6 @@ _int_cmp(gconstpointer a, gconstpointer b)
 bool
 _policy_checker_is_matched(_match_criteria_t *match_criteria, fido_authenticator_s *auth_info)
 {
-       _INFO("_policy_checker_is_matched::start");
 
        /* -1 means the int value is not present, so we should ignore that. */
 
@@ -63,7 +62,6 @@ _policy_checker_is_matched(_match_criteria_t *match_criteria, fido_authenticator
                (strlen(auth_info->aaid) > 0)) {
                aaid_list = g_list_first(aaid_list);
                if (g_list_find_custom(aaid_list, auth_info->aaid, (GCompareFunc)strcmp) == NULL) {
-                       _ERR("AAID match failed");
                        return false;
                }
        }
@@ -82,8 +80,6 @@ _policy_checker_is_matched(_match_criteria_t *match_criteria, fido_authenticator
                        (strlen(auth_vendor) > 0)) {
                        vendor_list = g_list_first(vendor_list);
                        if (g_list_find_custom(vendor_list, auth_vendor, (GCompareFunc)strcmp) == NULL) {
-                               _ERR("Vendor ID match failed");
-
                                SAFE_DELETE(auth_aaid);
                                return false;
                        }
@@ -91,15 +87,12 @@ _policy_checker_is_matched(_match_criteria_t *match_criteria, fido_authenticator
                SAFE_DELETE(auth_aaid);
        }
 
-       _INFO("keyid matching start");
-
        /* 3. If any Key ID is mentioned in match_criteria, then atleast one Key ID should match */
        GList *key_id_list = match_criteria->key_id_list;
 
        if (key_id_list != NULL) {
 
                if (auth_info->key_ids == NULL) {
-                       _ERR("keyID match failed");
                        return false;
                }
 
@@ -118,7 +111,6 @@ _policy_checker_is_matched(_match_criteria_t *match_criteria, fido_authenticator
                        char *key_id = (char*) (key_id_iter->data);
                        if (key_id) {
                                if (g_list_find_custom(auth_key_ids, key_id, (GCompareFunc)strcmp) != NULL) {
-                                       _INFO("keyid matched [%s]", key_id);
                                        common_key_id_list = g_list_append(common_key_id_list, strdup(key_id));
                                }
                        }
@@ -126,7 +118,6 @@ _policy_checker_is_matched(_match_criteria_t *match_criteria, fido_authenticator
                }
 
                if (common_key_id_list == NULL) {
-                       _ERR("keyID match failed");
                        return false;
                }
 
@@ -549,14 +540,10 @@ _policy_checker_get_matched_auth_list(_policy_t *policy, GList *auth_list)
 GList*
 _policy_checker_get_matched_auth_list_dereg(const char *app_id, GList *input_auth_list, GList *available_auth_list)
 {
-       _INFO("");
-
        RET_IF_FAIL(app_id, NULL);
        RET_IF_FAIL(input_auth_list, NULL);
        RET_IF_FAIL(available_auth_list, NULL);
 
-       _INFO("");
-
        GList *matched_auth_dereg_list = NULL;
 
        GList *input_auth_list_iter = g_list_first(input_auth_list);
@@ -585,7 +572,6 @@ _policy_checker_get_matched_auth_list_dereg(const char *app_id, GList *input_aut
                                else
                                        _ERR("Authenticator does not have any ASM ID!!");
 
-                               _INFO("");
                                matched_auth_dereg_list = g_list_append(matched_auth_dereg_list, matched_auth_dereg);
                        }
                        available_auth_list_iter = available_auth_list_iter->next;