DRM Spec changed.

Signed-off-by: sunggun.jung <sunggun.jung@samsung.com>
Change-Id: I63e39fcd90165e4af3734c8f6d08d0fe56473270

diff --git a/inc/DrmService.h b/inc/DrmService.h
index 1bace4f..5bb1633 100644 (file)
--- a/inc/DrmService.h
+++ b/inc/DrmService.h
@@ -26,7 +26,7 @@
 #include <FIo.h>
 #include <DrmServiceDl.h>
 
-#define DRM_SERVICE "SAPPS_DRM_SERVICE"
+#define DRM_SERVICE "TIZEN_DRM_SERVICE"
 
 namespace Tizen { namespace Base
 {

diff --git a/inc/DrmServiceDl.h b/inc/DrmServiceDl.h
index f1b562b..f21d732 100644 (file)
--- a/inc/DrmServiceDl.h
+++ b/inc/DrmServiceDl.h
@@ -19,12 +19,7 @@ typedef int (*DRM_OEM_SAPPS_GENERATE_LICENSE_REQUEST) (const char *pRespBuf, uns
 typedef int (*DRM_OEM_SAPPS_REGISTER_LICENSE) (const char *pRespBuf, unsigned int respBufLen);
 typedef int (*DRM_OEM_SAPPS_IS_DRM_FILE) (const char *pDcfPath, int dcfPathLen);
 typedef int (*DRM_OEM_SAPPS_DECRYPT_PACKAGE) (const char *pSADCFilepath, int sadcFileLen, const char *pDecryptedFile, int decryptedFileLen);
-typedef int (*DRM_OEM_SAPPS_IS_DRM_APP) (const char *pSzCid, int cidLen);
-typedef int (*DRM_OEM_SAPPS_UNINSTALL_LICENSE) (const char *szCid, int cidLen);
-typedef int (*DRM_OEM_SAPPS_GET_FILE_HEADER) (const char *pSADCFilepath, char *cid, unsigned int cidLength, char *riurl, unsigned int riurlLength);
 typedef int (*DRM_OEM_SAPPS_GENERATE_PURCHASE_REQUEST) (const char *pSADCFilepath, char *pReqBuf, unsigned int *pReqBufLen, char *pLicenseUrl, unsigned int *pLicenseUrlLen);
-typedef int (*DRM_OEM_SAPPS_HAS_VALID_LICENSE) (const char *szCid);
-typedef int (*DRM_OEM_SAPPS_CONSUME_LICENSE) (const char *szCid);
 
 /*Samsung Apps function start*/
 typedef enum {
@@ -32,12 +27,7 @@ typedef enum {
        FUNC_DRM_OEM_SAPPS_REGISTER_LICENSE,
        FUNC_DRM_OEM_SAPPS_IS_DRM_FILE,
        FUNC_DRM_OEM_SAPPS_DECRYPT_PACKAGE,
-       FUNC_DRM_OEM_SAPPS_IS_DRM_APP,
-       FUNC_DRM_OEM_SAPPS_UNINSTALL_LICENSE,
-       FUNC_DRM_OEM_SAPPS_GET_FILE_HEADER,
        FUNC_DRM_OEM_SAPPS_GENERATE_PURCHASE_REQUEST,
-       FUNC_DRM_OEM_SAPPS_HAS_VALID_LICENSE,
-       FUNC_DRM_OEM_SAPPS_CONSUME_LICENSE,
        FUNC_DRM_SAPPS_MAX
 } drm_sapps_enum_t;
 
@@ -46,12 +36,7 @@ typedef struct {
        DRM_OEM_SAPPS_REGISTER_LICENSE drm_oem_sapps_register_license;
        DRM_OEM_SAPPS_IS_DRM_FILE drm_oem_sapps_is_drm_file;
        DRM_OEM_SAPPS_DECRYPT_PACKAGE drm_oem_sapps_decrypt_package;
-       DRM_OEM_SAPPS_IS_DRM_APP drm_oem_sapps_is_drm_app;
-       DRM_OEM_SAPPS_UNINSTALL_LICENSE drm_oem_sapps_uninstall_license;
-       DRM_OEM_SAPPS_GET_FILE_HEADER drm_oem_sapps_get_file_header;
        DRM_OEM_SAPPS_GENERATE_PURCHASE_REQUEST drm_oem_sapps_generate_purchase_request;
-       DRM_OEM_SAPPS_HAS_VALID_LICENSE drm_oem_sapps_has_valid_license;
-       DRM_OEM_SAPPS_CONSUME_LICENSE drm_oem_sapps_consume_license;
 } drm_sapps_func_t;
 
 #endif

diff --git a/packaging/osp-security-service.spec b/packaging/osp-security-service.spec
index 22aebec..8b99c86 100755 (executable)
--- a/packaging/osp-security-service.spec
+++ b/packaging/osp-security-service.spec
@@ -1,6 +1,6 @@
 Name:          osp-security-service
 Summary:       osp security service
-Version:       1.2.2.0
+Version:       1.2.2.1
 Release:       1
 Group:         TO_BE/FILLED_IN
 License:       TO_BE/FILLED_IN

diff --git a/src/DrmService.cpp b/src/DrmService.cpp
index 33fb856..f5a9dd5 100755 (executable)
--- a/src/DrmService.cpp
+++ b/src/DrmService.cpp
@@ -46,12 +46,7 @@ const char *DRM_SAPPS_API[] = {
        "drm_oem_sapps_register_license",
        "drm_oem_sapps_is_drm_file",
        "drm_oem_sapps_decrypt_package",
-       "drm_oem_sapps_is_drm_app",
-       "drm_oem_sapps_uninstall_license",
-       "drm_oem_sapps_get_file_header",
        "drm_oem_sapps_generate_purchase_request",
-       "drm_oem_sapps_has_valid_license",
-       "drm_oem_sapps_consume_license",
        "\0"
 };