E2EE: Cleanup TZ data after tests

Change-Id: I2edc6e1fdec3b6be6db1cf4cd9781568597eb985

diff --git a/src/e2ee-adaptation-layer/tests.cpp b/src/e2ee-adaptation-layer/tests.cpp
index e770527d238cb412b78269f11a44b3ebb0b1be9c..1b4fd124d6014d805db6490ebfa0ffa1c7375192 100644 (file)
--- a/src/e2ee-adaptation-layer/tests.cpp
+++ b/src/e2ee-adaptation-layer/tests.cpp
@@ -38,6 +38,9 @@ const KeyAliasPair WRONG = { "wrong_ec_private", "wrong_ec_public" };
 const KeyAliasPair RSA_KEYS = { "rsa_private", "rsa_public" };
 
 const char* const DERIVED = "derived";
+const char* const OURS_DERIVED = "ours_derived";
+const char* const PEERS_DERIVED = "peers_derived";
+const char* const PEERS2_DERIVED = "peers2_derived";
 
 constexpr size_t SALT_LEN = 16;
 const unsigned char SALT[SALT_LEN] = {};
@@ -86,6 +89,21 @@ public:
 
     void Finish() override
     {
+        auto remove = [](const KeyAliasPair& pair) {
+            ckmc_remove_alias(pair.prv.c_str());
+            ckmc_remove_alias(pair.pub.c_str());
+        };
+        remove(OURS);
+        remove(PEERS);
+        remove(PEERS2);
+        remove(WRONG);
+        remove(RSA_KEYS);
+
+        ckmc_remove_alias(DERIVED);
+        ckmc_remove_alias(OURS_DERIVED);
+        ckmc_remove_alias(PEERS_DERIVED);
+        ckmc_remove_alias(PEERS2_DERIVED);
+
         int ret = ckmc_lock_user_key(UID);
         if (ret != CKMC_ERROR_NONE)
             RUNNER_ERROR_MSG("DB lock failed: " << CKMCErrorToString(ret));
@@ -116,10 +134,6 @@ RUNNER_TEST_GROUP_INIT_ENV(E2EE_ADAPTATION_LAYER, EALGroupFixture);
 
 RUNNER_TEST(TEAL_0010_key_agreement_positive)
 {
-    const char* const OURS_DERIVED = "ours_derived";
-    const char* const PEERS_DERIVED = "peers_derived";
-    const char* const PEERS2_DERIVED = "peers2_derived";
-
     auto our_remover = keyAgreement(OURS.prv, PEERS.pub, OURS_DERIVED);
     auto peer_remover = keyAgreement(PEERS.prv, OURS.pub, PEERS_DERIVED);
     auto peer2_remover = keyAgreement(PEERS2.prv, OURS.pub, PEERS2_DERIVED);