Unify variable naming in key export

Change-Id: Ic89b6105e420b9eceb93e9e6bdf112c4de3c1a65

diff --git a/src/include/ckm/ckm-manager.h b/src/include/ckm/ckm-manager.h
index 5eb3f17..2208def 100644 (file)
--- a/src/include/ckm/ckm-manager.h
+++ b/src/include/ckm/ckm-manager.h
@@ -187,8 +187,8 @@ public:
        int exportWrappedKey(const CryptoAlgorithm &params,
                                                 const Alias &wrappingKeyAlias,
                                                 const Password &wrappingKeyPassword,
-                                                const Alias &wrappedKeyAlias,
-                                                const Password &wrappedKeyPassword,
+                                                const Alias &alias,
+                                                const Password &password,
                                                 KeyType &keyType,
                                                 RawBuffer &wrappedKey);
 

diff --git a/src/manager/client-capi/ckmc-manager.cpp b/src/manager/client-capi/ckmc-manager.cpp
index 24aa8cb..1e12ee4 100644 (file)
--- a/src/manager/client-capi/ckmc-manager.cpp
+++ b/src/manager/client-capi/ckmc-manager.cpp
@@ -1054,15 +1054,15 @@ KEY_MANAGER_CAPI
 int ckmc_export_wrapped_key(const ckmc_param_list_h params,
                                                        const char *wrapping_key_alias,
                                                        const char *wrapping_key_password,
-                                                       const char *wrapped_key_alias,
-                                                       const char *wrapped_key_password,
+                                                       const char *alias,
+                                                       const char *password,
                                                        ckmc_key_s **ppwrapped_key)
 {
        EXCEPTION_GUARD_START_CAPI
 
        if (params == nullptr ||
                wrapping_key_alias == nullptr ||
-               wrapped_key_alias == nullptr ||
+               alias == nullptr ||
                ppwrapped_key == nullptr)
                        return CKMC_ERROR_INVALID_PARAMETER;
 
@@ -1071,21 +1071,24 @@ int ckmc_export_wrapped_key(const ckmc_param_list_h params,
 
        int ret = 0;
        ckmc_key_s *wrapped_key = nullptr;
-       CKM::RawBuffer wrappedKey;
-       CKM::KeyType keyType = CKM::KeyType::KEY_NONE;
+       CKM::RawBuffer wrapped_key_buffer;
+       CKM::KeyType key_type = CKM::KeyType::KEY_NONE;
        auto mgr = CKM::Manager::create();
 
        ret = to_ckmc_error(mgr->exportWrappedKey(*ca,
                                                                                          CKM::Alias(wrapping_key_alias),
                                                                                          _tostring(wrapping_key_password),
-                                                                                         CKM::Alias(wrapped_key_alias),
-                                                                                         _tostring(wrapped_key_password),
-                                                                                         keyType,
-                                                                                         wrappedKey));
+                                                                                         CKM::Alias(alias),
+                                                                                         _tostring(password),
+                                                                                         key_type,
+                                                                                         wrapped_key_buffer));
 
        if (ret == CKMC_ERROR_NONE) {
-               ckmc_key_type_e key_type = static_cast<ckmc_key_type_e>(keyType);
-               ret = ckmc_key_new(wrappedKey.data(), wrappedKey.size(), key_type, nullptr, &wrapped_key);
+               ret = ckmc_key_new(wrapped_key_buffer.data(),
+                                  wrapped_key_buffer.size(),
+                                  static_cast<ckmc_key_type_e>(key_type),
+                                  nullptr,
+                                  &wrapped_key);
                if (ret == CKMC_ERROR_NONE)
                        *ppwrapped_key = wrapped_key;
        }

diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp
index b788197..14173e1 100644 (file)
--- a/src/manager/client/client-manager-impl.cpp
+++ b/src/manager/client/client-manager-impl.cpp
@@ -792,15 +792,15 @@ int Manager::Impl::importWrappedKey(const CryptoAlgorithm &params,
 int Manager::Impl::exportWrappedKey(const CryptoAlgorithm &params,
                                                                        const Alias &wrappingKeyAlias,
                                                                        const Password &wrappingKeyPassword,
-                                                                       const Alias &wrappedKeyAlias,
-                                                                       const Password &wrappedKeyPassword,
+                                                                       const Alias &alias,
+                                                                       const Password &password,
                                                                        KeyType &keyType,
                                                                        RawBuffer &wrappedKey)
 {
        EXCEPTION_GUARD_START_CPPAPI
 
        AliasSupport wrapping_helper(wrappingKeyAlias);
-       AliasSupport wrapped_helper(wrappedKeyAlias);
+       AliasSupport helper(alias);
        DataType dataTypeKey;
 
        int retCode = Request(*this,
@@ -810,9 +810,9 @@ int Manager::Impl::exportWrappedKey(const CryptoAlgorithm &params,
                wrapping_helper.getName(),
                wrapping_helper.getOwner(),
                wrappingKeyPassword,
-               wrapped_helper.getName(),
-               wrapped_helper.getOwner(),
-               wrappedKeyPassword
+               helper.getName(),
+               helper.getOwner(),
+               password
        ).maybeDeserialize(dataTypeKey, wrappedKey);
 
        if (retCode != CKM_API_SUCCESS)

diff --git a/src/manager/client/client-manager-impl.h b/src/manager/client/client-manager-impl.h
index b63598c..fb06743 100644 (file)
--- a/src/manager/client/client-manager-impl.h
+++ b/src/manager/client/client-manager-impl.h
@@ -152,8 +152,8 @@ public:
        int exportWrappedKey(const CryptoAlgorithm &params,
                                                 const Alias &wrappingKeyAlias,
                                                 const Password &wrappingKeyPassword,
-                                                const Alias &wrappedKeyAlias,
-                                                const Password &wrappedKeyPassword,
+                                                const Alias &alias,
+                                                const Password &password,
                                                 KeyType &keyType,
                                                 RawBuffer &wrappedKey);
 

diff --git a/src/manager/client/client-manager.cpp b/src/manager/client/client-manager.cpp
index 4d9fcd6..71be983 100644 (file)
--- a/src/manager/client/client-manager.cpp
+++ b/src/manager/client/client-manager.cpp
@@ -318,8 +318,8 @@ int  Manager::exportWrappedKey(
        const CryptoAlgorithm &params,
        const Alias &wrappingKeyAlias,
        const Password &wrappingKeyPassword,
-       const Alias &wrappedKeyAlias,
-       const Password &wrappedKeyPassword,
+       const Alias &alias,
+       const Password &password,
        KeyType &keyType,
        RawBuffer &wrappedKey)
 {
@@ -327,8 +327,8 @@ int  Manager::exportWrappedKey(
                params,
                wrappingKeyAlias,
                wrappingKeyPassword,
-               wrappedKeyAlias,
-               wrappedKeyPassword,
+               alias,
+               password,
                keyType,
                wrappedKey
        );

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index 5366ca9..21f0ac3 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -1605,9 +1605,9 @@ RawBuffer CKMLogic::exportWrappedKey(
        const Name &wrappingKeyName,
        const ClientId &wrappingKeyOwner,
        const Password &wrappingKeyPassword,
-       const Name &wrappedKeyName,
-       const ClientId &wrappedKeyOwner,
-       const Password &wrappedKeyPassword)
+       const Name &keyName,
+       const ClientId &keyOwner,
+       const Password &keyPassword)
 {
        Crypto::GObjUPtr wrappingKey;
        DB::Row wrappedKeyRow;
@@ -1620,12 +1620,12 @@ RawBuffer CKMLogic::exportWrappedKey(
                if (retCode != CKM_API_SUCCESS)
                        return retCode;
 
-               retCode = readRowHelper(false, cred, DataType::DB_KEY_FIRST, wrappedKeyName,
-                                                               wrappedKeyOwner, wrappedKeyPassword, wrappedKeyRow, wrappedKeyType);
+               retCode = readRowHelper(false, cred, DataType::DB_KEY_FIRST, keyName,
+                                                               keyOwner, keyPassword, wrappedKeyRow, wrappedKeyType);
                if (retCode != CKM_API_SUCCESS)
                        return retCode;
 
-               wrappedKey = wrappingKey->wrap(params, wrappedKeyRow, wrappedKeyPassword);
+               wrappedKey = wrappingKey->wrap(params, wrappedKeyRow, keyPassword);
 
                return retCode;
        });

diff --git a/src/manager/service/ckm-logic.h b/src/manager/service/ckm-logic.h
index 933ba08..36eb56d 100644 (file)
--- a/src/manager/service/ckm-logic.h
+++ b/src/manager/service/ckm-logic.h
@@ -222,9 +222,9 @@ public:
                const Name &wrappingKeyName,
                const ClientId &wrappingKeyOwner,
                const Password &wrappingKeyPassword,
-               const Name &wrappedKeyName,
-               const ClientId &wrappedKeyOwner,
-               const Password &wrappedKeyPassword);
+               const Name &keyName,
+               const ClientId &keyOwner,
+               const Password &keyPassword);
 
        int setPermissionHelper(
                const Credentials &cred,

diff --git a/src/manager/service/ckm-service.cpp b/src/manager/service/ckm-service.cpp
index 71899ab..511f271 100644 (file)
--- a/src/manager/service/ckm-service.cpp
+++ b/src/manager/service/ckm-service.cpp
@@ -497,17 +497,16 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                Name wrappingKeyName;
                ClientId wrappingKeyOwner;
                Password wrappingKeyPassword;
-               Name wrappedKeyName;
-               ClientId wrappedKeyOwner;
-               Password wrappedKeyPassword;
+               Name keyName;
+               Password keyPassword;
 
                buffer.Deserialize(params,
                                                   wrappingKeyName,
                                                   wrappingKeyOwner,
                                                   wrappingKeyPassword,
-                                                  wrappedKeyName,
-                                                  wrappedKeyOwner,
-                                                  wrappedKeyPassword);
+                                                  keyName,
+                                                  explicitOwner,
+                                                  keyPassword);
 
                return m_logic->exportWrappedKey(
                                        cred,
@@ -516,9 +515,9 @@ RawBuffer CKMService::ProcessStorage(Credentials &cred, MessageBuffer &buffer)
                                        wrappingKeyName,
                                        cred.effectiveOwner(wrappingKeyOwner),
                                        wrappingKeyPassword,
-                                       wrappedKeyName,
-                                       cred.effectiveOwner(wrappedKeyOwner),
-                                       wrappedKeyPassword);
+                                       keyName,
+                                       cred.effectiveOwner(explicitOwner),
+                                       keyPassword);
        }
 
        default: