[Release] wrt-commons_0.2.104 for sdk branch

Merge remote-tracking branch 'origin/master' into remotes/origin/sdk

diff --cc debian/changelog
index a0a429e5f46a712cacedc954bc048b6cb78400e5,a5d8034791fbfc1239cd80a3753fde802f3c0000..e0e8d1b44f868196b92086760a9afbfee5309f3c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
 -wrt-commons (0.2.103ubuntu1) oneiric; urgency=low
++wrt-commons (0.2.104) oneiric; urgency=low
+ 
+   * Revert "Add encrypt/decrypt API from trust zone"
+ 
+  -- Soyoung Kim <sy037.kim@samsung.com>  Mon, 11 Mar 2013 19:46:44 +0900
+ 
  wrt-commons (0.2.103) unstable; urgency=low
  
    * Update tizen version to 2.1

diff --cc modules/encryption/include/dpl/encryption/resource_decryption.h
Simple merge

diff --cc modules/encryption/include/dpl/encryption/resource_encryption.h
Simple merge

diff --cc modules/encryption/src/resource_decryption.cpp
index d51adfbd2fe5e85824fe829736b2dcf77517e28e,c599e647d82eb146332a7834646881e3790386bc..3315016739902beb2ee73e87a36377a783427ced
--- 1/modules/encryption/src/resource_decryption.cpp
--- 2/modules/encryption/src/resource_decryption.cpp
+++ b/modules/encryption/src/resource_decryption.cpp
@@@ -87,41 -84,4 +84,5 @@@ void ResourceDecryptor::GetDecryptedChu
      AES_cbc_encrypt(inBuf, decBuf, inBufSize, &m_decKey, ivec, AES_DECRYPT);
      LogDebug("Success decryption");
  }
- int ResourceDecryptor::DecryptChunkByTrustZone(
-         std::string pkgid, const unsigned char* inBuffer,
-         int inBufSize)
- {
-     using namespace Tizen::Base;
- 
-     const byte *b_pkgid = reinterpret_cast<const byte*>(pkgid.c_str());
-     ByteBuffer appInfo;
-     appInfo.Construct(pkgid.length());
-     appInfo.SetArray(b_pkgid, 0, pkgid.length());
-     appInfo.Flip();
- 
-     Tizen::Security::Crypto::_TrustZoneService* pInstance;
-     pInstance = Tizen::Security::Crypto::_TrustZoneService::GetInstance();
- 
-     ByteBuffer pBuf;
-     pBuf.Construct(inBufSize);
-     const byte *pByte = reinterpret_cast<const byte*>(inBuffer);
-     pBuf.SetArray(pByte, 0, inBufSize);
-     pBuf.Flip();
- 
-     ByteBuffer *getBuffer = pInstance->_TrustZoneService::DecryptN(appInfo, pBuf);
- 
-     m_getBuffer = reinterpret_cast<void*>(getBuffer);
-     return getBuffer->GetRemaining();
- }
- 
- void ResourceDecryptor::getDecryptStringByTrustZone(unsigned char *decBuffer)
- {
-     using namespace Tizen::Base;
-     LogDebug("Get decrypted string");
-     ByteBuffer *buffer = reinterpret_cast<ByteBuffer*>(m_getBuffer);
-     memcpy(decBuffer, buffer->GetPointer(), buffer->GetRemaining());
-     buffer->Reset();
- }
- 
 +
  } //namespace WRTDecryptor

diff --cc modules/encryption/src/resource_encryption.cpp
index 67f9061c80ddb5d7417ea55ca5d54f29007cd6f3,8dc52845efed6e832d8428c5ef05c98329434136..932b543fdaab17846b1b47124b068b9411d9c29c
--- 1/modules/encryption/src/resource_encryption.cpp
--- 2/modules/encryption/src/resource_encryption.cpp
+++ b/modules/encryption/src/resource_encryption.cpp
@@@ -33,8 -31,7 +31,7 @@@ namespace 
  #define KEY_SIZE 16
  }
  namespace WRTEncryptor {
- ResourceEncryptor::ResourceEncryptor() :
-     m_getBuffer(NULL)
 -ResourceEncryptor::ResourceEncryptor()
++ResourceEncryptor::ResourceEncryptor() 
  {
      LogDebug("Started Encrytion");
  }
@@@ -86,42 -83,4 +83,5 @@@ void ResourceEncryptor::EncryptChunk(un
  
      AES_cbc_encrypt(inputBuf, encBuf, chunkSize, &m_encKey, ivec, AES_ENCRYPT);
  }
- int ResourceEncryptor::EncryptChunkByTrustZone(
-         std::string pkgid,
-         const unsigned char *plainBuffer,
-         int pBufSize)
- {
-     using namespace Tizen::Base;
- 
-     const byte *b_pkgid = reinterpret_cast<const byte*>(pkgid.c_str());
-     ByteBuffer appInfo;
-     appInfo.Construct(pkgid.length());
-     appInfo.SetArray(b_pkgid, 0, pkgid.length());
-     appInfo.Flip();
- 
-     Tizen::Security::Crypto::_TrustZoneService* pInstance;
-     pInstance = Tizen::Security::Crypto::_TrustZoneService::GetInstance();
- 
-     ByteBuffer pBuf;
-     pBuf.Construct(pBufSize);
-     const byte *pByte = reinterpret_cast<const byte*>(plainBuffer);
-     pBuf.SetArray(pByte, 0, pBufSize);
-     pBuf.Flip();
- 
-     ByteBuffer *getBuffer =
-         pInstance->_TrustZoneService::EncryptN(appInfo, pBuf);
-     m_getBuffer = reinterpret_cast<void*>(getBuffer);
- 
-     return getBuffer->GetRemaining();
- }
- 
- void ResourceEncryptor::getEncStringByTrustZone(unsigned char *encBuffer)
- {
-     using namespace Tizen::Base;
-     LogDebug("Get encrypted String");
-     ByteBuffer *buffer = reinterpret_cast<ByteBuffer*>(m_getBuffer);
-     memcpy(encBuffer, buffer->GetPointer(), buffer->GetRemaining());
-     buffer->Reset();
- }
 +
  } //namespace ResourceEnc