Update IMA states. 50/26750/1
authorJanusz Kozerski <j.kozerski@samsung.com>
Wed, 27 Aug 2014 08:28:53 +0000 (10:28 +0200)
committerJanusz Kozerski <j.kozerski@samsung.com>
Thu, 28 Aug 2014 11:41:59 +0000 (13:41 +0200)
Change-Id: I86ba6c411e8b7e2c014d6a5d7c2b4e7f8cfb8bcd
Signed-off-by: Janusz Kozerski <j.kozerski@samsung.com>
src/service/service/ima-evm-server-set-state.cpp

index 13533fd..eec892d 100644 (file)
@@ -102,13 +102,9 @@ int IMAEVMStateService::imaState(int state)
     case IMA_SERVER_API_STATE_DISABLED:
         return IMA_STATE_DISABLED;
     case IMA_SERVER_API_STATE_IGNORE:
-    //TODO: Update the IMA state enums when libimaevm will be updated.
-    //    return IMA_STATE_IGNORE;
-        return IMA_STATE_DISABLED;
-    //case IMA_SERVER_API_STATE_ENFORCE:
-    //    return IMA_STATE_ENFORCE;
+        return IMA_STATE_IGNORE;
     case IMA_SERVER_API_STATE_ENFORCE:
-          return IMA_STATE_ENABLED;
+        return IMA_STATE_ENFORCE;
     case IMA_SERVER_API_STATE_FIX:
         return IMA_STATE_FIX;
     default:
@@ -121,12 +117,10 @@ int IMAEVMStateService::imaStateServer(int state)
     switch (state) {
     case IMA_STATE_DISABLED:
         return IMA_SERVER_API_STATE_DISABLED;
-       // or  return IMA_SERVER_API_STATE_IGNORE;
-       //TODO: Update the IMA state enums when libimaevm will be updated.
-    //case IMA_STATE_ENFORCE:
-        // return IMA_SERVER_API_STATE_ENFORCE;
-    case IMA_STATE_ENABLED:
-        return IMA_SERVER_API_STATE_ENFORCE;
+    case IMA_STATE_IGNORE:
+        return IMA_SERVER_API_STATE_IGNORE;
+    case IMA_STATE_ENFORCE:
+         return IMA_SERVER_API_STATE_ENFORCE;
     case IMA_STATE_FIX:
         return IMA_SERVER_API_STATE_FIX;
     default: