diff options
author | Dongsun Lee <ds73.lee@samsung.com> | 2015-08-13 16:35:58 +0900 |
---|---|---|
committer | Dongsun Lee <ds73.lee@samsung.com> | 2015-08-13 16:39:51 +0900 |
commit | 671aefceb8f5249194c2abfc1bdeddb7d16a7631 (patch) | |
tree | 46f5e1e555980a34bfb5eade99257886416a7fcc /srcs/web_app_enc.c | |
parent | 391c9b75f18989c2778c0cc804a4eddb38a3f050 (diff) | |
download | libwebappenc-c9a99f1daaf13315efab82f11a52d46df0bf0de5.tar.gz libwebappenc-c9a99f1daaf13315efab82f11a52d46df0bf0de5.tar.bz2 libwebappenc-c9a99f1daaf13315efab82f11a52d46df0bf0de5.zip |
change API signatures to support GLOBAL app and NORMAL app at the same timetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen/20150820.084129submit/tizen/20150820.083859accepted/tizen/wearable/20150820.115949accepted/tizen/tv/20150820.115853accepted/tizen/mobile/20150820.115727tizen_3.0.m1_tvtizen_3.0.m1_mobile
Change-Id: Ic9a60b295bff13bb59c1c6990dfbad569e92c267
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>
Diffstat (limited to 'srcs/web_app_enc.c')
-rw-r--r-- | srcs/web_app_enc.c | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/srcs/web_app_enc.c b/srcs/web_app_enc.c index 7bc8484..39865bc 100644 --- a/srcs/web_app_enc.c +++ b/srcs/web_app_enc.c @@ -29,7 +29,7 @@ #include "wae_log.h" -int _wae_encrypt_downloaded_web_application(const char* pPkgId, +int _wae_encrypt_downloaded_web_application(const char* pPkgId, wae_app_type_e appType, const unsigned char* pData, size_t dataLen, unsigned char** ppEncryptedData, size_t* pEncDataLen) { @@ -55,9 +55,9 @@ int _wae_encrypt_downloaded_web_application(const char* pPkgId, // get APP_DEK. // if not exists, create APP_DEK - ret = get_app_dek(pPkgId, &pDek, &dekLen); + ret = get_app_dek(pPkgId, appType, &pDek, &dekLen); if(ret == WAE_ERROR_NO_KEY) { - ret = create_app_dek(pPkgId, &pDek, &dekLen); + ret = create_app_dek(pPkgId, appType, &pDek, &dekLen); } if(ret != WAE_ERROR_NONE) { goto error; @@ -76,7 +76,7 @@ error: return ret; } -int _wae_decrypt_downloaded_web_application(const char* pPkgId, +int _wae_decrypt_downloaded_web_application(const char* pPkgId, wae_app_type_e appType, const unsigned char* pData, size_t dataLen, unsigned char** ppDecryptedData, size_t* pDecDataLen) { @@ -100,7 +100,7 @@ int _wae_decrypt_downloaded_web_application(const char* pPkgId, goto error; } - ret = get_app_dek(pPkgId, &pDek, &dekLen); + ret = get_app_dek(pPkgId, appType, &pDek, &dekLen); if(ret != WAE_ERROR_NONE) { goto error; } @@ -163,51 +163,56 @@ error: return ret; } -int _wae_decrypt_preloaded_web_application(const char* pPkgId, +int _wae_decrypt_preloaded_web_application(const char* pPkgId, wae_app_type_e appType, const unsigned char* pData, size_t dataLen, unsigned char** ppDecryptedData, size_t* pDecDataLen) { // same with the decryption of downloaded web application - return _wae_decrypt_downloaded_web_application(pPkgId, pData, dataLen, ppDecryptedData, pDecDataLen); + return _wae_decrypt_downloaded_web_application(pPkgId, appType, + pData, dataLen, ppDecryptedData, pDecDataLen); } -int wae_encrypt_web_application(const char* pPkgId,int isPreloaded, +int wae_encrypt_web_application(const char* pPkgId, wae_app_type_e appType, const unsigned char* pData, size_t dataLen, unsigned char** ppEncryptedData, size_t* pEncDataLen) { int ret = WAE_ERROR_NONE; - if(isPreloaded) - ret = _wae_encrypt_preloaded_web_application(pPkgId, pData, dataLen, ppEncryptedData, pEncDataLen); + if(appType == WAE_PRELOADED_APP) + ret = _wae_encrypt_preloaded_web_application(pPkgId, + pData, dataLen, ppEncryptedData, pEncDataLen); else - ret = _wae_encrypt_downloaded_web_application(pPkgId, pData, dataLen, ppEncryptedData, pEncDataLen); + ret = _wae_encrypt_downloaded_web_application(pPkgId, appType, + pData, dataLen, ppEncryptedData, pEncDataLen); - WAE_SLOGI("Encrypt Web App. pkgId=%s, isPreloaded=%d, dataLen=%d, ret=%d", - pPkgId, isPreloaded, dataLen, ret); + WAE_SLOGI("Encrypt Web App. pkgId=%s, appType=%d, dataLen=%d, ret=%d", + pPkgId, appType, dataLen, ret); return ret; } -int wae_decrypt_web_application(const char* pPkgId, int isPreloaded, +int wae_decrypt_web_application(const char* pPkgId, wae_app_type_e appType, const unsigned char* pData, size_t dataLen, unsigned char** ppDecryptedData, size_t* pDecDataLen) { int ret = WAE_ERROR_NONE; - if(isPreloaded) - ret = _wae_decrypt_preloaded_web_application(pPkgId, pData, dataLen, ppDecryptedData, pDecDataLen); + if(appType == WAE_PRELOADED_APP) + ret = _wae_decrypt_preloaded_web_application(pPkgId, appType, + pData, dataLen, ppDecryptedData, pDecDataLen); else - ret =_wae_decrypt_downloaded_web_application(pPkgId, pData, dataLen, ppDecryptedData, pDecDataLen); + ret = _wae_decrypt_downloaded_web_application(pPkgId, appType, + pData, dataLen, ppDecryptedData, pDecDataLen); - WAE_SLOGI("Decrypt Web App. pkgId=%s, isPreloaded=%d, dataLen=%d, ret=%d", - pPkgId, isPreloaded, dataLen, ret); + WAE_SLOGI("Decrypt Web App. pkgId=%s, appType=%d, dataLen=%d, ret=%d", + pPkgId, appType, dataLen, ret); return ret; } -int wae_remove_app_dek(const char* pPkgId) +int wae_remove_app_dek(const char* pPkgId, wae_app_type_e appType) { int ret = WAE_ERROR_NONE; - ret = remove_app_dek(pPkgId); - WAE_SLOGI("Remove APP DEK. pkgId=%s, ret=%d", pPkgId, ret); + ret = remove_app_dek(pPkgId, appType); + WAE_SLOGI("Remove APP DEK. pkgId=%s, appType=%d, ret=%d", pPkgId, appType, ret); return ret; } |