Remove double checking of key type

Change-Id: Iae2c23f0c8f8124d8c6cae843385cd8722019af8

diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp
index 05993f6..ad2cdf2 100644 (file)
--- a/src/manager/client/client-manager-impl.cpp
+++ b/src/manager/client/client-manager-impl.cpp
@@ -825,9 +825,8 @@ int Manager::Impl::wrapConcatenatedData(const CryptoAlgorithm &params,
 
        AliasSupport wrappingAliasHelper(wrappingKeyAlias);
        AliasSupport aliasHelper(alias);
-       DataType dataTypeKey;
 
-       int retCode = Request(*this,
+       return Request(*this,
                LogicCommand::WRAP_CONCATENATED_DATA,
                m_storageConnection,
                CryptoAlgorithmSerializable(params),
@@ -838,16 +837,7 @@ int Manager::Impl::wrapConcatenatedData(const CryptoAlgorithm &params,
                aliasHelper.getOwner(),
                password,
                data
-       ).maybeDeserialize(dataTypeKey, wrappedKey);
-
-       if (retCode != CKM_API_SUCCESS)
-               return retCode;
-
-       if (!dataTypeKey.isSymmetricKey()) {
-               return CKM_API_ERROR_INVALID_FORMAT;
-       }
-
-       return retCode;
+       ).maybeDeserialize(wrappedKey);
 
        EXCEPTION_GUARD_END
 }

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index a6b2470..2c9ff8e 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -1717,7 +1717,7 @@ RawBuffer CKMLogic::wrapConcatenatedData(
                return retCode2;
        });
 
-       return SerializeMessage(msgID, retCode, keyType, wrappedKey);
+       return SerializeMessage(msgID, retCode, wrappedKey);
 }
 
 RawBuffer CKMLogic::unwrapConcatenatedData(