merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:25 +0000 (01:18 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:25 +0000 (01:18 +0900)
commitca9f56072393c2dda88655ae9c4167c576adb2f6
treef8bdf95fb4160cc0f56597f4c06dcead958d31f6
parent3b35ba7d54ca2f87abbb12acf00a82a6ca6f36d1
merge with master
111 files changed:
client/CMakeLists.txt
client/ClientChannel.cpp
client/ClientDispatcher.cpp
client/ClientIPC.cpp
client/Reader.cpp
client/SEService.cpp
client/Session.cpp
client/include/ClientChannel.h
client/include/ClientDispatcher.h
client/include/ClientIPC.h
client/include/Reader.h
client/include/SEService.h
client/include/SEServiceListener.h
client/include/Session.h
client/include/smartcard-service.h [new file with mode: 0644]
common/APDUHelper.cpp
common/AccessCondition.cpp
common/AccessControlList.cpp
common/ByteArray.cpp
common/CMakeLists.txt
common/DispatcherHelper.cpp
common/EFDIR.cpp [new file with mode: 0644]
common/Exception.cpp [new file with mode: 0644]
common/FCI.cpp
common/FileObject.cpp
common/GPSEACL.cpp
common/IPCHelper.cpp
common/ISO7816BERTLV.cpp
common/Message.cpp
common/NumberStream.cpp
common/PKCS15.cpp
common/PKCS15DODF.cpp
common/PKCS15ODF.cpp
common/PKCS15OID.cpp
common/PKCS15Object.cpp
common/PKCS15Path.cpp
common/PKCS15TokenInfo.cpp
common/ProviderHelper.cpp
common/ReaderHelper.cpp
common/Record.cpp [deleted file]
common/SEServiceHelper.cpp
common/Serializable.cpp
common/SessionHelper.cpp
common/SignatureHelper.cpp
common/SimpleTLV.cpp
common/Synchronous.cpp
common/TLVHelper.cpp
common/include/APDUHelper.h
common/include/AccessCondition.h
common/include/AccessControlList.h
common/include/ByteArray.h
common/include/Channel.h
common/include/Debug.h
common/include/DispatcherHelper.h
common/include/DispatcherMsg.h
common/include/EFDIR.h [new file with mode: 0644]
common/include/Exception.h [new file with mode: 0644]
common/include/FCI.h
common/include/FileObject.h
common/include/GPSEACL.h
common/include/IPCHelper.h
common/include/ISO7816BERTLV.h
common/include/Lock.h
common/include/Message.h
common/include/NumberStream.h
common/include/OpensslHelper.h
common/include/PKCS15.h
common/include/PKCS15DODF.h
common/include/PKCS15ODF.h
common/include/PKCS15OID.h
common/include/PKCS15Object.h
common/include/PKCS15Path.h
common/include/PKCS15TokenInfo.h
common/include/ProviderHelper.h
common/include/ReaderHelper.h
common/include/Record.h
common/include/SEServiceHelper.h
common/include/Serializable.h
common/include/SessionHelper.h
common/include/SignatureHelper.h
common/include/SimpleTLV.h
common/include/Synchronous.h
common/include/TLVHelper.h
common/include/Terminal.h
common/include/TerminalInterface.h
common/include/smartcard-types.h
packaging/smartcard-service.spec
server/CMakeLists.txt
server/ClientInstance.cpp
server/ServerChannel.cpp
server/ServerDispatcher.cpp
server/ServerIPC.cpp
server/ServerReader.cpp
server/ServerResource.cpp
server/ServerSEService.cpp
server/ServerSession.cpp
server/ServiceInstance.cpp
server/include/ClientInstance.h
server/include/ServerChannel.h
server/include/ServerDispatcher.h
server/include/ServerIPC.h
server/include/ServerReader.h
server/include/ServerResource.h
server/include/ServerSEService.h
server/include/ServerSession.h
server/include/ServiceInstance.h
server/smartcard-daemon.cpp
smartcard-service-server.manifest
test-client/CMakeLists.txt
test-client/test-client-sync.cpp
test-client/test-client.cpp