Pass proper owner to hashing function

Explicit owner may be empty. In such case the default owner value
should be taken from user's credentials.

Change-Id: I59dc0d421975bc7b329a609ebddc35420cea446c

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index 928ed0d..d3c6f91 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -1349,11 +1349,11 @@ int CKMLogic::createKeyPairHelper(
        bool exportable = policyPrivate.extractable || policyPublic.extractable;
        Policy lessRestricted(Password(), exportable, policyPrivate.backend);
 
-       auto digestPriv = CryptoLogic::makeHash(namePrivate, explicitOwnerPrivate, cred.clientUid);
+       auto digestPriv = CryptoLogic::makeHash(namePrivate, ownerPrv, cred.clientUid);
        if (digestPriv.empty())
                return CKM_API_ERROR_HASH_ERROR;
 
-       auto digestPub = CryptoLogic::makeHash(namePublic, explicitOwnerPublic, cred.clientUid);
+       auto digestPub = CryptoLogic::makeHash(namePublic, ownerPub, cred.clientUid);
        if (digestPub.empty())
                return CKM_API_ERROR_HASH_ERROR;