tizen 2.4 release

[framework/security/key-manager.git] / src / manager / client-capi / ckmc-type-converter.cpp

diff --git a/src/manager/client-capi/ckmc-type-converter.cpp b/src/manager/client-capi/ckmc-type-converter.cpp
index 479e327..97fcfe7 100644 (file)
--- a/src/manager/client-capi/ckmc-type-converter.cpp
+++ b/src/manager/client-capi/ckmc-type-converter.cpp
@@ -23,12 +23,6 @@
 #include <ckmc/ckmc-type.h>
 #include <ckmc-type-converter.h>
 
-typedef enum __ckmc_permission{
-    CKMC_PERMISSION_NONE        = 0x00, /**< clear permissions */
-    CKMC_PERMISSION_READ        = 0x01, /**< read allowed */
-    CKMC_PERMISSION_REMOVE      = 0x02  /**< remove allowed */
-} ckmc_permission_e;
-
 int to_ckm_error(int ckmc_error) {
     switch(ckmc_error) {
     case CKMC_ERROR_NONE:                  return CKM_API_SUCCESS;
@@ -52,9 +46,10 @@ int to_ckm_error(int ckmc_error) {
     case CKMC_ERROR_FILE_ACCESS_DENIED:    return CKM_API_ERROR_FILE_ACCESS_DENIED;
     case CKMC_ERROR_NOT_EXPORTABLE:        return CKM_API_ERROR_NOT_EXPORTABLE;
     case CKMC_ERROR_FILE_SYSTEM:           return CKM_API_ERROR_FILE_SYSTEM;
+    case CKMC_ERROR_NOT_SUPPORTED:         return CKM_API_ERROR_NOT_SUPPORTED;
     case CKMC_ERROR_UNKNOWN:               return CKM_API_ERROR_UNKNOWN;
     }
-    return CKMC_ERROR_UNKNOWN;
+    return CKM_API_ERROR_UNKNOWN;
 }
 
 int to_ckmc_error(int ckm_error) {
@@ -80,11 +75,26 @@ int to_ckmc_error(int ckm_error) {
     case CKM_API_ERROR_FILE_ACCESS_DENIED:    return CKMC_ERROR_FILE_ACCESS_DENIED;
     case CKM_API_ERROR_NOT_EXPORTABLE:        return CKMC_ERROR_NOT_EXPORTABLE;
     case CKM_API_ERROR_FILE_SYSTEM:           return CKMC_ERROR_FILE_SYSTEM;
+    case CKM_API_ERROR_NOT_SUPPORTED:         return CKMC_ERROR_NOT_SUPPORTED;
     case CKM_API_ERROR_UNKNOWN:               return CKMC_ERROR_UNKNOWN;
     }
     return CKMC_ERROR_UNKNOWN;
 }
 
+ckmc_ocsp_status_e to_ckmc_ocsp_status(int ckm_ocsp_status) {
+    switch(ckm_ocsp_status) {
+    case CKM_API_OCSP_STATUS_GOOD:             return CKMC_OCSP_STATUS_GOOD;
+    case CKM_API_OCSP_STATUS_UNSUPPORTED:      return CKMC_OCSP_ERROR_UNSUPPORTED;
+    case CKM_API_OCSP_STATUS_REVOKED:          return CKMC_OCSP_STATUS_REVOKED;
+    case CKM_API_OCSP_STATUS_NET_ERROR:        return CKMC_OCSP_ERROR_NET;
+    case CKM_API_OCSP_STATUS_INVALID_URL:      return CKMC_OCSP_ERROR_INVALID_URL;
+    case CKM_API_OCSP_STATUS_INVALID_RESPONSE: return CKMC_OCSP_ERROR_INVALID_RESPONSE;
+    case CKM_API_OCSP_STATUS_REMOTE_ERROR:     return CKMC_OCSP_ERROR_REMOTE;
+    case CKM_API_OCSP_STATUS_INTERNAL_ERROR:   return CKMC_OCSP_ERROR_INTERNAL;
+    default:                                   return CKMC_OCSP_STATUS_UNKNOWN;
+    }
+}
+
 int access_to_permission_mask(ckmc_access_right_e ar, int & permissionMask)
 {
     switch(ar)