From 4661ab1b5a9fe4a03a449d89d14690ee3ae83217 Mon Sep 17 00:00:00 2001 From: "isaac2.lee" Date: Wed, 19 Oct 2022 17:31:14 +0900 Subject: [PATCH] fix the bugs for unit-test Change-Id: Iab602ca7fe596976ae8bade4703db0dbd8170473 --- src/manager/service/key-provider.cpp | 4 ++-- tests/encryption-scheme/scheme-test.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/manager/service/key-provider.cpp b/src/manager/service/key-provider.cpp index 66a5dae..d379e5c 100644 --- a/src/manager/service/key-provider.cpp +++ b/src/manager/service/key-provider.cpp @@ -583,9 +583,9 @@ RawBuffer KeyProvider::reencrypt( const Password &oldPass, const Password &newPass) { - if (domainKEKInWrapForm.size() != sizeof(WrappedKeyAndInfo)) { + if (domainKEKInWrapForm.size() != sizeof(WrappedKeyAndInfoDKEK)) { LogError("input size:" << domainKEKInWrapForm.size() - << " Expected: " << sizeof(WrappedKeyAndInfo)); + << " Expected: " << sizeof(WrappedKeyAndInfoDKEK)); ThrowErr(Exc::InternalError, "buffer doesn't have proper size to store " "WrappedKeyAndInfo in KeyProvider::reencrypt"); diff --git a/tests/encryption-scheme/scheme-test.cpp b/tests/encryption-scheme/scheme-test.cpp index bfaaef9..e04f640 100644 --- a/tests/encryption-scheme/scheme-test.cpp +++ b/tests/encryption-scheme/scheme-test.cpp @@ -859,6 +859,10 @@ void SchemeTest::EnableDirectDbAccess() FileSystem fs(UID); auto wrappedDKEK = fs.getDKEK(); auto keyProvider = KeyProvider(wrappedDKEK, DBPASS); + if (!keyProvider.isInitialized()) { + keyProvider.migrateDKEK(wrappedDKEK, DBPASS); + fs.saveDKEK(keyProvider.getWrappedDomainKEK(DBPASS)); + } auto wrappedDatabaseDEK = fs.getDBDEK(); RawBuffer key = keyProvider.getPureDEK(wrappedDatabaseDEK); -- 2.7.4