Return proper error for wrong wrapped key type

[platform/core/security/key-manager.git] / src / manager / client / client-manager-impl.cpp

diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp
index 0204028..961f31d 100644 (file)
--- a/src/manager/client/client-manager-impl.cpp
+++ b/src/manager/client/client-manager-impl.cpp
@@ -403,7 +403,9 @@ int Manager::Impl::getDataAliasVector(AliasVector &aliasVector)
 
 int Manager::Impl::getKeyAliasInfoVector(AliasInfoVector &aliasInfoVector)
 {
+       EXCEPTION_GUARD_START_CPPAPI
        return getAliasInfoVectorHelper(DataType::DB_KEY_LAST, aliasInfoVector);
+       EXCEPTION_GUARD_END
 }
 
 int Manager::Impl::getKeyEncryptionStatus(const Alias &alias, bool &status)
@@ -413,7 +415,9 @@ int Manager::Impl::getKeyEncryptionStatus(const Alias &alias, bool &status)
 
 int Manager::Impl::getCertificateAliasInfoVector(AliasInfoVector &aliasInfoVector)
 {
+       EXCEPTION_GUARD_START_CPPAPI
        return getAliasInfoVectorHelper(DataType::CERTIFICATE, aliasInfoVector);
+       EXCEPTION_GUARD_END
 }
 
 int Manager::Impl::getCertificateEncryptionStatus(const Alias &alias, bool &status)
@@ -423,7 +427,9 @@ int Manager::Impl::getCertificateEncryptionStatus(const Alias &alias, bool &stat
 
 int Manager::Impl::getDataAliasInfoVector(AliasInfoVector &aliasInfoVector)
 {
+       EXCEPTION_GUARD_START_CPPAPI
        return getAliasInfoVectorHelper(DataType::BINARY_DATA, aliasInfoVector);
+       EXCEPTION_GUARD_END
 }
 
 int Manager::Impl::getDataEncryptionStatus(const Alias &alias, bool &status)
@@ -742,6 +748,9 @@ int Manager::Impl::importWrappedKey(const CryptoAlgorithm &params,
 {
        EXCEPTION_GUARD_START_CPPAPI
 
+       if (keyType == KeyType::KEY_NONE)
+               return CKM_API_ERROR_INPUT_PARAM;
+
        AliasSupport wrapping_helper(wrappingKeyAlias);
        AliasSupport helper(alias);