Fix errors in client.

Change-Id: I5634f3ff2981663ee34026dc4860153604a49f17

diff --git a/src/include/ckm/key-manager.h b/src/include/ckm/key-manager.h
index 6d4eb82..4f97ae9 100644 (file)
--- a/src/include/ckm/key-manager.h
+++ b/src/include/ckm/key-manager.h
@@ -153,6 +153,11 @@ public:
 
     int saveKey(const Alias &alias, const Key &key, const Policy &policy);
     int saveCertificate(const Alias &alias, const Certificate &cert, const Policy &policy);
+
+    /*
+     * Data must be extractable. If you set extractable bit to false funciton will
+     * return ERROR_INPUT_PARAM.
+     */
     int saveData(const Alias &alias, const RawBuffer &data, const Policy &policy);
 
     int removeKey(const Alias &alias);

diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp
index d9b162c..d5bf19a 100644 (file)
--- a/src/manager/client/client-manager-impl.cpp
+++ b/src/manager/client/client-manager-impl.cpp
@@ -74,6 +74,8 @@ int Manager::ManagerImpl::saveBinaryData(
 }
 
 int Manager::ManagerImpl::saveKey(const Alias &alias, const Key &key, const Policy &policy) {
+    if (key.empty())
+        return KEY_MANAGER_API_ERROR_INPUT_PARAM;
     return saveBinaryData(alias, toDBDataType(key.getType()), key.getDER(), policy);
 }
 
@@ -86,6 +88,8 @@ int Manager::ManagerImpl::saveCertificate(
 }
 
 int Manager::ManagerImpl::saveData(const Alias &alias, const RawBuffer &rawData, const Policy &policy) {
+    if (!policy.extractable)
+        return KEY_MANAGER_API_ERROR_INPUT_PARAM;
     return saveBinaryData(alias, DBDataType::BINARY_DATA, rawData, policy);
 }