From: Jihoon Jung Date: Thu, 10 Dec 2015 02:26:48 +0000 (+0900) Subject: sync with Tizen 2.4 X-Git-Tag: submit/tizen/20151210.024050^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3454647e34b0f2a3cc4e25b571b40ae3c73f060b;p=platform%2Fcore%2Fconnectivity%2Fsmartcard-plugin-uicc.git sync with Tizen 2.4 Signed-off-by: Ji-hoon Jung Change-Id: I3d023d9d86f6eadf21d95c3df04222307aa330fe --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 946a492..3b315bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ FOREACH(flag ${pkgs_common_CFLAGS}) SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} -finstrument-functions -std=c++0x") #SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") #SET(CMAKE_C_FLAGS_RELEASE "-O2") @@ -50,4 +50,9 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_common_LDFLAGS}) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}/se) +IF (TIZEN_ARCH_64) + INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib64/se) +ELSE (TIZEN_ARCH_64) + INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib/se) +ENDIF(TIZEN_ARCH_64) + diff --git a/UICCTerminal.cpp b/UICCTerminal.cpp index e00d446..8986167 100644 --- a/UICCTerminal.cpp +++ b/UICCTerminal.cpp @@ -44,6 +44,14 @@ using namespace smartcard_service_api; static const char *se_name = "SIM1"; /* below functions will be called when dlopen or dlclose is called */ + +typedef struct _context_s +{ + GMainLoop *loop; + void *resp; +} +context_s; + void __attribute__ ((constructor)) lib_init() { } @@ -143,9 +151,20 @@ static void _uiccGetATRCallback(TapiHandle *handle, int result, } } +static void _uiccCallback_sync(TapiHandle *handle, int result, + void *data, void *user_data) +{ + context_s* context = (context_s*)user_data; + + if(result == TAPI_SIM_ACCESS_SUCCESS) + context->resp = data; + + g_main_loop_quit(context->loop); +} + namespace smartcard_service_api { - UICCTerminal::UICCTerminal() : Terminal(), complete(false) + UICCTerminal::UICCTerminal() : Terminal() { name = (char *)se_name; @@ -170,6 +189,10 @@ namespace smartcard_service_api if (initialized == false) { +// char **cpList = NULL; +// +// cpList = tel_get_cp_name_list(); + handle = tel_init(NULL); if (handle != NULL) { @@ -179,6 +202,9 @@ namespace smartcard_service_api TAPI_NOTI_SIM_STATUS, &UICCTerminal::uiccStatusNotiCallback, this); + if (error < 0) { + _ERR("tel_register_noti_event failed, [%d]", error); + } initialized = true; } @@ -199,7 +225,10 @@ namespace smartcard_service_api if (isInitialized()) { - tel_deregister_noti_event(handle, TAPI_NOTI_SIM_STATUS); + if (tel_deregister_noti_event(handle, + TAPI_NOTI_SIM_STATUS) < 0) { + _ERR("tel_deregister_noti_event failed"); + } tel_deinit(handle); @@ -231,46 +260,34 @@ namespace smartcard_service_api { if (command.size() > 0) { + TelSimApduResp_t *resp = NULL; TelSimApdu_t apdu_data = { 0, }; + context_s context = { NULL, resp }; + + context.loop = g_main_loop_new(NULL, false); apdu_data.apdu = (uint8_t *)command.getBuffer(); apdu_data.apdu_len = command.size(); - complete = false; - error = 0; - this->response.clear(); - result = tel_req_sim_apdu(handle, &apdu_data, - &UICCTerminal::uiccTransmitAPDUCallback, - this); - if (result == 0) + _uiccCallback_sync, &context); + if (result != 0) { - while (complete == false) { - g_main_context_iteration(NULL, - false); - } - - result = error; - - if (error == SCARD_ERROR_OK && - this->response.size() > 0) - { - response = this->response; - } - else - { - _ERR("tel_req_sim_apdu failed, cbResult [%d]", error); - } + _ERR("tel_req_sim_apdu failed [%d]", result); + + result = SCARD_ERROR_IO_FAILED; } else { - _ERR("tel_req_sim_apdu failed [%d]", result); - result = SCARD_ERROR_IO_FAILED; + g_main_loop_run(context.loop); + response.assign(((TelSimApduResp_t *)context.resp)->apdu_resp, + ((TelSimApduResp_t *)context.resp)->apdu_resp_len); } } else { _ERR("apdu is empty"); + result = SCARD_ERROR_ILLEGAL_PARAM; } } @@ -288,35 +305,29 @@ namespace smartcard_service_api SCOPE_LOCK(mutex) { - complete = false; - error = 0; - this->response.clear(); + TelSimAtrResp_t *resp = NULL; + context_s context = { NULL, resp }; + + context.loop = g_main_loop_new(NULL, false); result = tel_req_sim_atr(handle, - &UICCTerminal::uiccGetAtrCallback, this); - if (result == 0) + _uiccCallback_sync, &context); + if(result != 0) { - while (complete == false) { - g_main_context_iteration(NULL, - false); - } - - result = error; + _ERR("tel_req_sim_atr failed [%d]", result); - if (error == SCARD_ERROR_OK && - this->response.size() > 0) - { - atr = this->response; - } - else - { - _ERR("tel_req_sim_atr failed, cbResult [%d]", error); - } + result = SCARD_ERROR_IO_FAILED; } else { - _ERR("tel_req_sim_atr failed [%d]", result); - result = SCARD_ERROR_IO_FAILED; + g_main_loop_run(context.loop); + + if((TelSimAtrResp_t *)context.resp != NULL && + ((TelSimAtrResp_t *)context.resp)->atr_resp != NULL ) + { + atr.assign(((TelSimAtrResp_t *)context.resp)->atr_resp, + ((TelSimAtrResp_t *)context.resp)->atr_resp_len); + } } } @@ -434,62 +445,6 @@ namespace smartcard_service_api return result; } - void UICCTerminal::uiccTransmitAPDUCallback(TapiHandle *handle, - int result, void *data, void *user_data) - { - UICCTerminal *instance = (UICCTerminal *)user_data; - TelSimAccessResult_t access_rt = (TelSimAccessResult_t)result; - TelSimApduResp_t *apdu = (TelSimApduResp_t *)data; - - instance->error = access_rt; - - if (instance->error == 0) - { - if (apdu != NULL && apdu->apdu_resp_len > 0) - { - instance->response.assign(apdu->apdu_resp, - apdu->apdu_resp_len); - } - - _DBG("response : %s", instance->response.toString().c_str()); - instance->error = SCARD_ERROR_OK; - } - else - { - _ERR("error : event->Status == [%d]", access_rt); - instance->error = SCARD_ERROR_IO_FAILED; - } - - instance->complete = true; - } - - void UICCTerminal::uiccGetAtrCallback(TapiHandle *handle, int result, - void *data, void *user_data) - { - UICCTerminal *instance = (UICCTerminal *)user_data; - TelSimAccessResult_t access_rt = (TelSimAccessResult_t)result; - TelSimAtrResp_t *atr = (TelSimAtrResp_t *)data; - - if (access_rt == 0) - { - if (atr != NULL && atr->atr_resp_len > 0) - { - instance->response.assign(atr->atr_resp, - atr->atr_resp_len); - } - - _DBG("response : %s", instance->response.toString().c_str()); - instance->error = SCARD_ERROR_OK; - } - else - { - _ERR("error : event->Status == [%d]", access_rt); - instance->error = SCARD_ERROR_IO_FAILED; - } - - instance->complete = true; - } - void UICCTerminal::uiccStatusNotiCallback(TapiHandle *handle, const char *noti_id, void *data, void *user_data) { diff --git a/include/UICCTerminal.h b/include/UICCTerminal.h index 6309026..ec700bb 100644 --- a/include/UICCTerminal.h +++ b/include/UICCTerminal.h @@ -39,17 +39,11 @@ namespace smartcard_service_api PMutex mutex; TapiHandle *handle; - /* temporary data for sync function */ - ByteArray response; - int error; - bool complete; - UICCTerminal(); ~UICCTerminal(); - static void uiccTransmitAPDUCallback(TapiHandle *handle, int result, void *data, void *user_data); - static void uiccGetAtrCallback(TapiHandle *handle, int result, void *data, void *user_data); - static void uiccStatusNotiCallback(TapiHandle *handle, const char *noti_id, void *data, void *user_data); + static void uiccStatusNotiCallback(TapiHandle *handle, + const char *noti_id, void *data, void *user_data); public: static UICCTerminal *getInstance(); @@ -65,12 +59,12 @@ namespace smartcard_service_api int transmitSync(const ByteArray &command, ByteArray &response); int getATRSync(ByteArray &atr); - int transmit(const ByteArray &command, terminalTransmitCallback callback, void *userParam); + int transmit(const ByteArray &command, + terminalTransmitCallback callback, void *userParam); int getATR(terminalGetATRCallback callback, void *userParam); - friend void uiccTransmitAPDUCallback(TapiHandle *handle, int result, void *data, void *user_data); - friend void uiccGetAtrCallback(TapiHandle *handle, int result, void *data, void *user_data); - friend void uiccStatusNotiCallback(TapiHandle *handle, const char *noti_id, void *data, void *user_data); + friend void uiccStatusNotiCallback(TapiHandle *handle, + const char *noti_id, void *data, void *user_data); }; } /* namespace smartcard_service_api */ diff --git a/packaging/smartcard-plugin-uicc b/packaging/smartcard-plugin-uicc new file mode 100644 index 0000000..ec68963 --- /dev/null +++ b/packaging/smartcard-plugin-uicc @@ -0,0 +1,206 @@ +Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + diff --git a/packaging/smartcard-plugin-uicc.changes b/packaging/smartcard-plugin-uicc.changes deleted file mode 100644 index f675d69..0000000 --- a/packaging/smartcard-plugin-uicc.changes +++ /dev/null @@ -1,6 +0,0 @@ -* Sun Aug 25 2013 Chengwei Yang accepted/tizen/20130710.221258@edeb8aa -- resetting manifest requested domain to floor -- merge with master -- Tizen 2.1 base -- Initial empty repository - diff --git a/packaging/smartcard-plugin-uicc.manifest b/packaging/smartcard-plugin-uicc.manifest deleted file mode 100644 index 017d22d..0000000 --- a/packaging/smartcard-plugin-uicc.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/smartcard-plugin-uicc.spec b/packaging/smartcard-plugin-uicc.spec index 7ff2926..da05e8e 100755 --- a/packaging/smartcard-plugin-uicc.spec +++ b/packaging/smartcard-plugin-uicc.spec @@ -1,17 +1,15 @@ -Name: smartcard-plugin-uicc -Summary: Smartcard plugin uicc -Version: 0.0.8 -Release: 0 -Group: Telephony/Service -License: Apache-2.0 -Source0: %{name}-%{version}.tar.gz -Source1001: smartcard-plugin-uicc.manifest -#ExclusiveArch: %%arm +Name: smartcard-plugin-uicc +Summary: Smartcard plugin uicc +Version: 0.0.10 +Release: 0 +Group: libs +License: Apache-2.0 +Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(tapi) -BuildRequires: pkgconfig(smartcard-service-common) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(tapi) +BuildRequires: pkgconfig(smartcard-service-common) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -19,22 +17,54 @@ Requires(postun): /sbin/ldconfig %description Smartcard Service plugin uicc + %prep %setup -q -cp %{SOURCE1001} . + + +%package devel +Summary: smartcard service uicc +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + + +%description devel +smartcard service. + %build -%cmake . +%if 0%{?sec_build_binary_debug_enable} +export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" +export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" +export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" +%endif +mkdir obj-arm-limux-qnueabi +cd obj-arm-limux-qnueabi +cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%ifarch aarch64 x86_64 + -DTIZEN_ARCH_64=1 \ +%endif + +#make %{?jobs:-j%jobs} + %install +cd obj-arm-limux-qnueabi %make_install +mkdir -p %{buildroot}/usr/share/license +cp -af %{_builddir}/%{name}-%{version}/packaging/%{name} %{buildroot}/usr/share/license/ + + +%post +/sbin/ldconfig + -%post -p /sbin/ldconfig +%postun +/sbin/ldconfig -%postun -p /sbin/ldconfig %files %manifest %{name}.manifest %defattr(-,root,root,-) %{_libdir}/se/lib*.so -%license LICENSE.APLv2 +%{_datadir}/license/%{name} diff --git a/smartcard-plugin-uicc.manifest b/smartcard-plugin-uicc.manifest new file mode 100644 index 0000000..ca37499 --- /dev/null +++ b/smartcard-plugin-uicc.manifest @@ -0,0 +1,6 @@ + + + + + +