From: Tomasz Swierczek Date: Wed, 20 Feb 2019 09:28:40 +0000 (+0100) Subject: Replace CKMErrorToString with APICodeToString X-Git-Tag: security-manager_5.5_testing~7^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f8295b35e15c936de62b3a15fde315dacf51fc3;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git Replace CKMErrorToString with APICodeToString CKMErrorToString is not needed as key-manager just gained almost exactly the same functionality in its ckm-error.h file. Change-Id: I4150246e4779b7ec4a03e43eef38ec5593159f8e --- diff --git a/src/ckm-integration/group01.cpp b/src/ckm-integration/group01.cpp index 563a68b6..90b87983 100644 --- a/src/ckm-integration/group01.cpp +++ b/src/ckm-integration/group01.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2015 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,32 +61,32 @@ RUNNER_CHILD_TEST(G01T01_ControlNegative) { RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = control->removeUserData(ps.GetUid())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = control->resetUserPassword(ps.GetUid(), "simple-password")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = control->resetUserPassword(ps.GetUid(), "something")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = control->unlockUserKey(ps.GetUid(), "test-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = control->lockUserKey(ps.GetUid())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = control->resetUserPassword(ps.GetUid(), "something")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = control->removeUserData(ps.GetUid())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_CHILD_TEST(G01T02_ControlPositive) { @@ -99,32 +99,32 @@ RUNNER_CHILD_TEST(G01T02_ControlPositive) { RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->removeUserData(USER_UID)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->resetUserPassword(USER_UID, "simple-password")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->resetUserPassword(USER_UID, "something")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_UID, "test-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->lockUserKey(USER_UID)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_BAD_REQUEST == (temp = control->resetUserPassword(USER_UID, "something")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->removeUserData(USER_UID)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_CHILD_TEST(G01T03_ProcessIdentificationBySecurityManager) { diff --git a/src/ckm-integration/group02.cpp b/src/ckm-integration/group02.cpp index 5fb68cf6..23bbf4aa 100644 --- a/src/ckm-integration/group02.cpp +++ b/src/ckm-integration/group02.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2015 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,11 +70,11 @@ RUNNER_CHILD_TEST(G02T01_StorageNegative) { RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->saveData(alias, rawBuffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->getData(alias, CKM::Password(), output)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_CHILD_TEST(G02T02_StoragePositive) { @@ -92,11 +92,11 @@ RUNNER_CHILD_TEST(G02T02_StoragePositive) { RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData(alias, rawBuffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getData(alias, CKM::Password(), output)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(rawBuffer == output, "Data mismatch."); } @@ -116,11 +116,11 @@ RUNNER_CHILD_TEST(G02T03_StoragePositive) { RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData(dataAlias, rawBuffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getData(dataAlias, CKM::Password(), output)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(rawBuffer == output, "Data mismatch."); } @@ -146,11 +146,11 @@ RUNNER_CHILD_TEST(G02T04_StorageNegative) { RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->saveData(alias, rawBuffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->getData(alias, CKM::Password(), output)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_CHILD_TEST(G02T05_StorageNegative) { @@ -169,10 +169,10 @@ RUNNER_CHILD_TEST(G02T05_StorageNegative) { RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->saveData(alias, rawBuffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->getData(alias, CKM::Password(), output)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } diff --git a/src/ckm-integration/process-settings/unlock-ckm.cpp b/src/ckm-integration/process-settings/unlock-ckm.cpp index 78f9a6af..94ad3711 100644 --- a/src/ckm-integration/process-settings/unlock-ckm.cpp +++ b/src/ckm-integration/process-settings/unlock-ckm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2015 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ void UnlockCkm::Apply() { RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(m_uid, "DummyPassword")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } @@ -53,7 +53,7 @@ void UnlockCkm::Revoke() { auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->removeUserData(m_uid)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } UnlockCkm::~UnlockCkm() {} diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp index 4d4b596a..714fa646 100644 --- a/src/ckm/ckm-common.cpp +++ b/src/ckm/ckm-common.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2000 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -122,35 +122,6 @@ const char * CKMCErrorToString(int error) { default: return "Error not defined"; } } - -const char * CKMErrorToString(int error) { - switch (error) { - ERRORDESCRIBE(CKM_API_SUCCESS); - ERRORDESCRIBE(CKM_API_ERROR_SOCKET); - ERRORDESCRIBE(CKM_API_ERROR_BAD_REQUEST); - ERRORDESCRIBE(CKM_API_ERROR_BAD_RESPONSE); - ERRORDESCRIBE(CKM_API_ERROR_SEND_FAILED); - ERRORDESCRIBE(CKM_API_ERROR_RECV_FAILED); - ERRORDESCRIBE(CKM_API_ERROR_AUTHENTICATION_FAILED); - ERRORDESCRIBE(CKM_API_ERROR_INPUT_PARAM); - ERRORDESCRIBE(CKM_API_ERROR_BUFFER_TOO_SMALL); - ERRORDESCRIBE(CKM_API_ERROR_OUT_OF_MEMORY); - ERRORDESCRIBE(CKM_API_ERROR_ACCESS_DENIED); - ERRORDESCRIBE(CKM_API_ERROR_SERVER_ERROR); - ERRORDESCRIBE(CKM_API_ERROR_DB_LOCKED); - ERRORDESCRIBE(CKM_API_ERROR_DB_ERROR); - ERRORDESCRIBE(CKM_API_ERROR_DB_ALIAS_EXISTS); - ERRORDESCRIBE(CKM_API_ERROR_DB_ALIAS_UNKNOWN); - ERRORDESCRIBE(CKM_API_ERROR_VERIFICATION_FAILED); - ERRORDESCRIBE(CKM_API_ERROR_INVALID_FORMAT); - ERRORDESCRIBE(CKM_API_ERROR_FILE_ACCESS_DENIED); - ERRORDESCRIBE(CKM_API_ERROR_NOT_EXPORTABLE); - ERRORDESCRIBE(CKM_API_ERROR_FILE_SYSTEM); - ERRORDESCRIBE(CKM_API_ERROR_NOT_SUPPORTED); - ERRORDESCRIBE(CKM_API_ERROR_UNKNOWN); - default: return "Error not defined"; - } -} #undef ERRORDESCRIBE std::string CKMCReadableError(int error) { @@ -369,7 +340,7 @@ void unlock_user_data(uid_t user_id, const char *passwd) int ret; auto control = CKM::Control::create(); RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (ret = control->unlockUserKey(user_id, passwd)), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } void remove_user_data(uid_t user_id) diff --git a/src/ckm/ckm-common.h b/src/ckm/ckm-common.h index 5a32bedb..69120c94 100644 --- a/src/ckm/ckm-common.h +++ b/src/ckm/ckm-common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2000 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,6 @@ extern const char *TEST_LABEL_5; // support for error printing const char * CKMCErrorToString(int error); -const char * CKMErrorToString(int error); std::string CKMCReadableError(int error); // RUNNER_ASSERT wrappers diff --git a/src/ckm/privileged/async-api.cpp b/src/ckm/privileged/async-api.cpp index 683c405e..69f090a5 100644 --- a/src/ckm/privileged/async-api.cpp +++ b/src/ckm/privileged/async-api.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2000 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Contact: Bumjin Im * @@ -331,8 +331,8 @@ void test_negative(F&& func, int expected, Args... args) RUNNER_ASSERT_MSG(obs->m_finished, "Request is not finished!"); RUNNER_ASSERT_MSG( obs->m_error == expected, - "Expected " << expected << "/" << CKMErrorToString(expected) << - " got: " << obs->m_error << "/" << CKMErrorToString(obs->m_error)); + "Expected " << expected << "/" << APICodeToString(expected) << + " got: " << obs->m_error << "/" << APICodeToString(obs->m_error)); } template @@ -352,7 +352,7 @@ MyObserverPtr test_positive(F&& func, Args... args) RUNNER_ASSERT_MSG(obs->m_finished, "Request is not finished!"); RUNNER_ASSERT_MSG(obs->m_error == 0, - "Request failed " << obs->m_error << "/" << CKMErrorToString(obs->m_error)); + "Request failed " << obs->m_error << "/" << APICodeToString(obs->m_error)); return obs; } diff --git a/src/ckm/privileged/cc-mode.cpp b/src/ckm/privileged/cc-mode.cpp index b2b29dbd..4a5f43e2 100644 --- a/src/ckm/privileged/cc-mode.cpp +++ b/src/ckm/privileged/cc-mode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2000 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -121,7 +121,7 @@ void save_keys() rsa_pub_alias, Policy(Password(), true), Policy(Password(), true))), - "Error=" << CKMErrorToString(temp)); + "Error=" << APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createKeyPairECDSA( @@ -130,14 +130,14 @@ void save_keys() ecdsa_pub_alias, Policy(Password(), true), Policy(Password(), true))), - "Error=" << CKMErrorToString(temp)); + "Error=" << APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createKeyAES( aes_length, aes_alias, Policy(Password(), true))), - "Error=" << CKMErrorToString(temp)); + "Error=" << APICodeToString(temp)); } void read_key(ManagerShPtr& manager, const Alias& alias, int expected) { @@ -145,8 +145,8 @@ void read_key(ManagerShPtr& manager, const Alias& alias, int expected) { int temp; RUNNER_ASSERT_MSG( expected == (temp = manager->getKey(alias, Password(), key)), - "Expected: " << expected << "/" << CKMErrorToString(expected) << " got: " << temp << "/" << - CKMErrorToString(temp)); + "Expected: " << expected << "/" << APICodeToString(expected) << " got: " << temp << "/" << + APICodeToString(temp)); } void read_keys(int expected) @@ -167,7 +167,7 @@ void update_cc_mode() auto control = Control::create(); int ret; RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (ret = control->updateCCMode()), - "Error=" << CKMErrorToString(ret)); + "Error=" << APICodeToString(ret)); } void restart_ckm(const char* const mdpp_setting) diff --git a/src/ckm/privileged/initial-values.cpp b/src/ckm/privileged/initial-values.cpp index f8d26e09..94f635a1 100644 --- a/src/ckm/privileged/initial-values.cpp +++ b/src/ckm/privileged/initial-values.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 - 2018 Samsung Electronics Co. + * Copyright (c) 2015 - 2019 Samsung Electronics Co. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -382,7 +382,7 @@ RUNNER_TEST_TZ_BACKEND(T7000_Encrypted_initial_values, RemoveDataEnv<0>) algo.setParam(CKM::ParamName::ED_IV, ivBin); auto mgr = CKM::Manager::create(); - RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = mgr->decrypt(algo, "/System TEI_0", CKM::Password(), messageBin, decrypted)), "Failed to decrypt " << CKMErrorToString(temp)); + RUNNER_ASSERT_MSG(CKM_API_SUCCESS == (temp = mgr->decrypt(algo, "/System TEI_0", CKM::Password(), messageBin, decrypted)), "Failed to decrypt " << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(std::string(decrypted.begin(), decrypted.end()) == EIV_PLAIN_MESSAGE, "Data does not match"); } diff --git a/src/ckm/privileged/main.cpp b/src/ckm/privileged/main.cpp index b652a230..f750ebe9 100644 --- a/src/ckm/privileged/main.cpp +++ b/src/ckm/privileged/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2016 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -102,10 +102,10 @@ RUNNER_TEST(T1511_insert_data) int status2 = manager->saveCertificate(certimAlias, certim, CKM::Policy()); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_EXISTS == status1, - "Certificate should be in database already. Error=" << CKMErrorToString(status1)); + "Certificate should be in database already. Error=" << CKM::APICodeToString(status1)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_EXISTS == status2, - "Certificate should be in database already. Error=" << CKMErrorToString(status2)); + "Certificate should be in database already. Error=" << CKM::APICodeToString(status2)); } } @@ -138,12 +138,12 @@ RUNNER_CHILD_TEST(T1702_insert_data) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == status1, - "Could not put certificate in datbase. Error=" << CKMErrorToString(status1)); + "Could not put certificate in datbase. Error=" << CKM::APICodeToString(status1)); CKM::AliasVector av; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getCertificateAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( (current_aliases_num+1) == static_cast(temp = av.size()), "Vector size: " << temp << ". Expected: " << (current_aliases_num+1)); @@ -155,7 +155,7 @@ RUNNER_TEST(T1703_removeApplicationData) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->removeApplicationData(TEST_LABEL)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); } RUNNER_CHILD_TEST(T1704_data_test) @@ -169,7 +169,7 @@ RUNNER_CHILD_TEST(T1704_data_test) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getCertificateAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( 0 == (temp = av.size()), "Vector size: " << temp << ". Expected: 0"); @@ -187,23 +187,23 @@ RUNNER_TEST(T17101_init) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->lockUserKey(USER_TEST+2)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->removeUserData(USER_TEST+2)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->unlockUserKey(USER_TEST+2, "t1706-special-password")), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->lockUserKey(USER_TEST+3)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->removeUserData(USER_TEST+3)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->unlockUserKey(USER_TEST+3, "t1706-special-password")), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); } RUNNER_CHILD_TEST(T17102_prep_data_01) @@ -222,7 +222,7 @@ RUNNER_CHILD_TEST(T17102_prep_data_01) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData("data1", buffer, exportable)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_CHILD_TEST(T17103_prep_data_02) @@ -241,7 +241,7 @@ RUNNER_CHILD_TEST(T17103_prep_data_02) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData("data2", buffer, exportable)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_CHILD_TEST(T17104_prep_data_03) @@ -260,7 +260,7 @@ RUNNER_CHILD_TEST(T17104_prep_data_03) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData("data3", buffer, exportable)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_CHILD_TEST(T17105_prep_data_04) @@ -279,7 +279,7 @@ RUNNER_CHILD_TEST(T17105_prep_data_04) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData("data4", buffer, exportable)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T17106_remove_application) @@ -289,10 +289,10 @@ RUNNER_TEST(T17106_remove_application) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->lockUserKey(USER_TEST+3)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->removeApplicationData(TEST_LABEL)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); } RUNNER_CHILD_TEST(T17107_check_data_01) @@ -306,7 +306,7 @@ RUNNER_CHILD_TEST(T17107_check_data_01) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getDataAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( 0 == (temp = av.size()), "Vector size: " << temp << ". Expected: 0"); @@ -323,7 +323,7 @@ RUNNER_CHILD_TEST(T17108_check_data_02) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getDataAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( 1 == (temp = av.size()), "Vector size: " << temp << ". Expected: 1"); @@ -336,7 +336,7 @@ RUNNER_TEST(T17109_unlock_user2) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->unlockUserKey(USER_TEST+3, "t1706-special-password")), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); } RUNNER_CHILD_TEST(T17110_check_data_03) @@ -351,7 +351,7 @@ RUNNER_CHILD_TEST(T17110_check_data_03) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getDataAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( 0 == (temp = av.size()), "Vector size: " << temp << ". Expected: 0"); @@ -369,7 +369,7 @@ RUNNER_CHILD_TEST(T17111_check_data_04) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getDataAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( 1 == (temp = av.size()), "Vector size: " << temp << ". Expected: 1"); diff --git a/src/ckm/unprivileged/async-api.cpp b/src/ckm/unprivileged/async-api.cpp index 38b73a57..e768a002 100644 --- a/src/ckm/unprivileged/async-api.cpp +++ b/src/ckm/unprivileged/async-api.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2000 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Contact: Bumjin Im * @@ -329,8 +329,8 @@ void test_negative(F&& func, int expected, Args... args) RUNNER_ASSERT_MSG(obs->m_finished, "Request is not finished!"); RUNNER_ASSERT_MSG( obs->m_error == expected, - "Expected " << expected << "/" << CKMErrorToString(expected) << - " got: " << obs->m_error << "/" << CKMErrorToString(obs->m_error)); + "Expected " << expected << "/" << APICodeToString(expected) << + " got: " << obs->m_error << "/" << APICodeToString(obs->m_error)); } template @@ -350,7 +350,7 @@ MyObserverPtr test_positive(F&& func, Args... args) RUNNER_ASSERT_MSG(obs->m_finished, "Request is not finished!"); RUNNER_ASSERT_MSG(obs->m_error == 0, - "Request failed " << obs->m_error << "/" << CKMErrorToString(obs->m_error)); + "Request failed " << obs->m_error << "/" << APICodeToString(obs->m_error)); return obs; } diff --git a/src/ckm/unprivileged/main.cpp b/src/ckm/unprivileged/main.cpp index 2f11f2e9..6f0966fb 100644 --- a/src/ckm/unprivileged/main.cpp +++ b/src/ckm/unprivileged/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2016 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,7 +83,7 @@ RUNNER_TEST(T0011_Control) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_APP, "simple-password")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T0012_Control) @@ -92,10 +92,10 @@ RUNNER_TEST(T0012_Control) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_APP, "simple-password")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->lockUserKey(USER_APP)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T0013_Control) @@ -104,7 +104,7 @@ RUNNER_TEST(T0013_Control) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_APP, "simple-password")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T0014_Control) @@ -113,31 +113,31 @@ RUNNER_TEST(T0014_Control) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->removeUserData(USER_APP_3)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->resetUserPassword(USER_APP_3, "simple-password")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->resetUserPassword(USER_APP_3, "something")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_APP_3, "test-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->lockUserKey(USER_APP_3)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_BAD_REQUEST == (temp = control->resetUserPassword(USER_APP_3, "something")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->removeUserData(USER_APP_3)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T0015_Control) @@ -146,16 +146,16 @@ RUNNER_TEST(T0015_Control) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_APP_2, "test-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->changeUserPassword(USER_APP_2, "test-pass", "new-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->lockUserKey(USER_APP_2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->removeUserData(USER_APP_2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T0016_Control_negative_wrong_password) @@ -164,19 +164,19 @@ RUNNER_TEST(T0016_Control_negative_wrong_password) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_APP_2, "test-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->changeUserPassword(USER_APP_2, "test-pass", "new-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->lockUserKey(USER_APP_2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_AUTHENTICATION_FAILED == (temp = control->unlockUserKey(USER_APP_2, "incorrect-password")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->removeUserData(USER_APP_2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST_GROUP_INIT(T101_CKM_QUICK_SET_GET_TESTS); @@ -208,10 +208,10 @@ RUNNER_TEST(T1011_key) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getKey(alias, CKM::Password(), key2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( key->getDER() == key2->getDER(), "Key value has been changed by service"); @@ -228,10 +228,10 @@ RUNNER_TEST(T1012_certificate) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveCertificate(alias, cert, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getCertificate(alias, CKM::Password(), cert2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( cert->getDER() == cert2->getDER(), "Data has been modified in key manager"); @@ -261,12 +261,12 @@ RUNNER_TEST(T1014_save_with_label) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(full_address, key, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); // lookup by name RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getKey(alias, CKM::Password(), key_name)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( key->getDER() == key_name->getDER(), "Key value has been changed by service"); @@ -274,7 +274,7 @@ RUNNER_TEST(T1014_save_with_label) // lookup by full address RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getKey(full_address, CKM::Password(), key_full_addr)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( key->getDER() == key_full_addr->getDER(), "Key value has been changed by service"); @@ -293,7 +293,7 @@ RUNNER_TEST(T1020_init) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_APP, "user-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1021_save_keys_get_alias) @@ -318,16 +318,16 @@ RUNNER_TEST(T1021_save_keys_get_alias) size_t current_aliases_num = count_aliases(ALIAS_KEY); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey("rootkey1", key, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey("rootkey2", key, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey("rootkey3", key, CKM::Policy(CKM::Password(), false))), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getKeyAliasVector(labelAliasVector)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( labelAliasVector.size() == (current_aliases_num+3), "Wrong size of list: " << labelAliasVector.size() << " Expected: " << (current_aliases_num+3)); @@ -355,16 +355,16 @@ RUNNER_TEST(T1022_app_user_save_keys_get_alias) size_t current_aliases_num = count_aliases(ALIAS_KEY); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey("appkey1", key, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey("appkey2", key, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey("appkey3", key, CKM::Policy(CKM::Password(), false))), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getKeyAliasVector(labelAliasVector)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( labelAliasVector.size() == (current_aliases_num+3), "Wrong size of list: " << labelAliasVector.size() << " Expected: " << (current_aliases_num+3)); @@ -392,13 +392,13 @@ RUNNER_TEST(T1023_app_user_save_keys_exportable_flag) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey("appkey4", key, notExportable)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_NOT_EXPORTABLE == (temp = manager->getKey("appkey4", CKM::Password(), key)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (temp = manager->saveData("data3", buffer, notExportable)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1024_app_user_save_keys_get_alias_pwd) @@ -423,14 +423,14 @@ RUNNER_TEST(T1024_app_user_save_keys_get_alias_pwd) expected.push_back(std::make_pair(currentAlias, !policy.password.empty())); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (exitCode = manager->saveKey(currentAlias, key, policy)), - "Error=" << CKMErrorToString(exitCode)); + "Error=" << CKM::APICodeToString(exitCode)); } CKM::AliasPwdVector actual; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (exitCode = manager->getKeyAliasPwdVector(actual)), - "Error=" << CKMErrorToString(exitCode)); + "Error=" << CKM::APICodeToString(exitCode)); RUNNER_ASSERT_MSG( actual.size() == (beforeSaveAliasCount + aliasNameCount), "Wrong aliases count: " << actual.size() << " Expected: " @@ -460,13 +460,13 @@ RUNNER_TEST(T1025_app_user_save_certificates_get_alias_pwd) expected.push_back(std::make_pair(currentAlias, !policy.password.empty())); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (exitCode = manager->saveCertificate(currentAlias, cert, policy)), - "Error=" << CKMErrorToString(exitCode)); + "Error=" << CKM::APICodeToString(exitCode)); } CKM::AliasPwdVector actual; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (exitCode = manager->getCertificateAliasPwdVector(actual)), - "Error=" << CKMErrorToString(exitCode)); + "Error=" << CKM::APICodeToString(exitCode)); RUNNER_ASSERT_MSG( actual.size() == (beforeSaveAliasCount + aliasNameCount), "Wrong aliases count: " << actual.size() << " Expected: " @@ -497,13 +497,13 @@ RUNNER_TEST(T1026_app_user_save_data_get_alias_pwd) expected.push_back(std::make_pair(currentAlias, !policy.password.empty())); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (exitCode = manager->saveData(currentAlias, buffer, policy)), - "Error=" << CKMErrorToString(exitCode)); + "Error=" << CKM::APICodeToString(exitCode)); } CKM::AliasPwdVector actual; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (exitCode = manager->getDataAliasPwdVector(actual)), - "Error=" << CKMErrorToString(exitCode)); + "Error=" << CKM::APICodeToString(exitCode)); RUNNER_ASSERT_MSG( actual.size() == (beforeSaveAliasCount + aliasNameCount), "Wrong aliases count: " << actual.size() << " Expected: " @@ -540,16 +540,16 @@ RUNNER_TEST(T1032_app_user_save_bin_data) size_t current_aliases_num = count_aliases(ALIAS_DATA); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData("appdata1", buffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData("appdata2", buffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData("appdata3", buffer, CKM::Policy(CKM::Password(), true))), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getDataAliasVector(labelAliasVector)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( labelAliasVector.size() == (current_aliases_num+3), "Wrong size of list: " << labelAliasVector.size() << " Expected: " << (current_aliases_num+3)); @@ -571,16 +571,16 @@ RUNNER_TEST(T1034_app_remove_bin_data) std::string invalid_address = aliasWithLabel("i-do-not-exist", "appdata1"); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (temp = manager->removeAlias(invalid_address.c_str())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->removeAlias("appdata1")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->removeAlias("appdata3")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getDataAliasVector(labelAliasVector)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( labelAliasVector.size() == (current_aliases_num-2), "Wrong size of list: " << labelAliasVector.size() << " Expected: " << (current_aliases_num-2)); @@ -588,13 +588,13 @@ RUNNER_TEST(T1034_app_remove_bin_data) CKM::RawBuffer buffer; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getData("appdata2", CKM::Password(), buffer)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( buffer == buffer2, "Data corrupted"); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (temp = manager->getData("appdata3", CKM::Password(), buffer)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1035_getData_wrong_password) @@ -610,19 +610,19 @@ RUNNER_TEST(T1035_getData_wrong_password) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveData("data4", buffer1, CKM::Policy("CorrectPassword"))), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); CKM::RawBuffer buffer; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getData("data4", CKM::Password("CorrectPassword"), buffer)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( buffer == buffer1, "Data corrupted"); RUNNER_ASSERT_MSG( CKM_API_ERROR_AUTHENTICATION_FAILED == (temp = manager->getData("data4", CKM::Password("WrongPassword"), buffer)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1036_deinit) @@ -639,7 +639,7 @@ RUNNER_TEST(T1040_init) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->unlockUserKey(USER_APP, "user-pass")), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1041_create_RSA_key) @@ -651,10 +651,10 @@ RUNNER_TEST(T1041_create_RSA_key) size_t current_aliases_num = count_aliases(ALIAS_KEY); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createKeyPairRSA(2048, CKM::Alias("PRV_KEY1_RSA"), CKM::Alias("PUB_KEY1_RSA"), CKM::Policy(), CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getKeyAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( (current_aliases_num+2) == static_cast(temp = av.size()), "Vector size: " << temp << ". Expected: " << (current_aliases_num+2)); @@ -668,10 +668,10 @@ RUNNER_TEST(T1042_create_RSA_key_foreign_label) RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->createKeyPairRSA(2048, CKM::Alias("iamsomebodyelse PRV_KEY2_RSA"), CKM::Alias("PUB_KEY2_RSA"), CKM::Policy(), CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->createKeyPairRSA(2048, CKM::Alias("PRV_KEY2_RSA"), CKM::Alias("iamsomebodyelse PUB_KEY2_RSA"), CKM::Policy(), CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1043_create_DSA_key) @@ -683,10 +683,10 @@ RUNNER_TEST(T1043_create_DSA_key) size_t current_aliases_num = count_aliases(ALIAS_KEY); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createKeyPairDSA(1024, CKM::Alias("PRV_KEY1_DSA"), CKM::Alias("PUB_KEY1_DSA"), CKM::Policy(), CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getKeyAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( (current_aliases_num+2) == static_cast(temp = av.size()), "Vector size: " << temp << ". Expected: " << (current_aliases_num+2)); @@ -701,10 +701,10 @@ RUNNER_TEST(T1044_create_AES_key) int current_aliases_num = count_aliases(ALIAS_KEY); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createKeyAES(128, CKM::Alias("KEY1_AES"), CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getKeyAliasVector(av)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( (current_aliases_num+1) == (temp = av.size()), "Vector size: " << temp << ". Expected: " << (current_aliases_num+1)); @@ -733,10 +733,10 @@ RUNNER_TEST(T1111_CreateKeyPairRSA) CKM::Policy p2; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createKeyPairRSA(1024, a1, a2, p1, p2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_EXISTS == (temp = manager->createKeyPairRSA(1024, a1, a2, p1, p2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1112_CreateKeyPairDSA) @@ -749,10 +749,10 @@ RUNNER_TEST(T1112_CreateKeyPairDSA) CKM::Policy p2; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createKeyPairDSA(1024, a1, a2, p1, p2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_EXISTS == (temp = manager->createKeyPairDSA(1024, a1, a2, p1, p2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1113_CreateKeyPairECDSA) @@ -765,7 +765,7 @@ RUNNER_TEST(T1113_CreateKeyPairECDSA) CKM::Policy p2; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createKeyPairECDSA(CKM::ElipticCurve::prime192v1, a1, a2, p1, p2)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1114_deinit) @@ -803,10 +803,10 @@ RUNNER_TEST(T12101_key_exist) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_EXISTS == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } /* @@ -836,7 +836,7 @@ RUNNER_TEST(T12102_saveKey_empty_alias) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } RUNNER_TEST(T12103_saveKey_foreign_label) @@ -861,7 +861,7 @@ RUNNER_TEST(T12103_saveKey_foreign_label) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } RUNNER_TEST(T12104_saveKey_empty_key) @@ -875,7 +875,7 @@ RUNNER_TEST(T12104_saveKey_empty_key) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } RUNNER_TEST(T12105_saveCertificate_empty_alias) @@ -889,7 +889,7 @@ RUNNER_TEST(T12105_saveCertificate_empty_alias) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (temp = manager->saveCertificate(alias, cert, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T12106_saveCertificate_foreign_label) @@ -903,7 +903,7 @@ RUNNER_TEST(T12106_saveCertificate_foreign_label) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->saveCertificate(alias, cert, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T12107_saveCertificate_empty_cert) @@ -917,7 +917,7 @@ RUNNER_TEST(T12107_saveCertificate_empty_cert) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (temp = manager->saveCertificate(alias, cert, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T12108_saveData_empty_alias) @@ -932,7 +932,7 @@ RUNNER_TEST(T12108_saveData_empty_alias) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (temp = manager->saveData(alias, buffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T12109_saveData_foreign_label) @@ -947,7 +947,7 @@ RUNNER_TEST(T12109_saveData_foreign_label) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_ACCESS_DENIED == (temp = manager->saveData(alias, buffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T12110_saveData_empty_data) @@ -961,7 +961,7 @@ RUNNER_TEST(T12110_saveData_empty_data) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (temp = manager->saveData(alias, buffer, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } /* @@ -979,7 +979,7 @@ RUNNER_TEST(T12111_getKey_alias_not_exist) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (temp = manager->getKey(alias, "", key)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T12112_getCertificate_alias_not_exist) @@ -993,7 +993,7 @@ RUNNER_TEST(T12112_getCertificate_alias_not_exist) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (temp = manager->getCertificate(alias, CKM::Password(), certificate)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T12113_getData_alias_not_exist) @@ -1006,7 +1006,7 @@ RUNNER_TEST(T12113_getData_alias_not_exist) CKM::Alias alias("some alias"); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (temp = manager->getData(alias, "", buffer)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } /* @@ -1038,7 +1038,7 @@ RUNNER_TEST(T12114_RSA_key_damaged) RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } RUNNER_TEST(T12115_RSA_key_too_short) @@ -1064,7 +1064,7 @@ RUNNER_TEST(T12115_RSA_key_too_short) RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } RUNNER_TEST(T12116_DSA_key_too_short) @@ -1093,7 +1093,7 @@ RUNNER_TEST(T12116_DSA_key_too_short) RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } RUNNER_TEST(T12117_AES_key_too_short) @@ -1109,7 +1109,7 @@ RUNNER_TEST(T12117_AES_key_too_short) RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } /* @@ -1157,7 +1157,7 @@ RUNNER_TEST(T12118_RSA_key_damaged_serviceTest) RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (ret = manager->saveKey(alias, key, CKM::Policy())), - "Error=" << CKMErrorToString(ret)); + "Error=" << CKM::APICodeToString(ret)); } RUNNER_TEST(T12119_saveCertificate_damaged_serviceTest) @@ -1200,7 +1200,7 @@ RUNNER_TEST(T12119_saveCertificate_damaged_serviceTest) auto manager = CKM::Manager::create(); RUNNER_ASSERT_MSG( CKM_API_ERROR_INPUT_PARAM == (temp = manager->saveCertificate(alias, cert, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T12120_deinit) @@ -1275,14 +1275,14 @@ RUNNER_TEST(T13129_get_chain) true, certChain); RUNNER_ASSERT_MSG(CKM_API_ERROR_VERIFICATION_FAILED == tmp, - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( 0 == certChain.size(), "Wrong size of certificate chain."); tmp = manager->getCertificateChain(cert, certVector, EMPTY_CERT_VECTOR, true, certChain); - RUNNER_ASSERT_MSG(CKM_API_SUCCESS == tmp, "Error=" << CKMErrorToString(tmp)); + RUNNER_ASSERT_MSG(CKM_API_SUCCESS == tmp, "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( 3 == certChain.size(), @@ -1306,7 +1306,7 @@ RUNNER_TEST(T1313_get_chain_with_alias) tmp = manager->getCertificateChain(cert, aliasVector, EMPTY_ALIAS_VECTOR, true, certChain); RUNNER_ASSERT_MSG(CKM_API_ERROR_VERIFICATION_FAILED == tmp, - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( 0 == certChain.size(), @@ -1314,12 +1314,12 @@ RUNNER_TEST(T1313_get_chain_with_alias) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->saveCertificate(alias, cert1, CKM::Policy())), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); aliasVector.push_back(alias); tmp = manager->getCertificateChain(cert, aliasVector, EMPTY_ALIAS_VECTOR, true, certChain); - RUNNER_ASSERT_MSG(CKM_API_SUCCESS == tmp, "Error=" << CKMErrorToString(tmp)); + RUNNER_ASSERT_MSG(CKM_API_SUCCESS == tmp, "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( 3 == certChain.size(), @@ -1341,14 +1341,14 @@ RUNNER_TEST(T13141_ocsp_check_valid_chain) tmp = manager->getCertificateChain(cert, EMPTY_CERT_VECTOR, EMPTY_CERT_VECTOR, true, certChain); RUNNER_ASSERT_MSG(CKM_API_ERROR_VERIFICATION_FAILED == tmp, - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( 0 == certChain.size(), "Wrong size of certificate chain."); tmp = manager->getCertificateChain(cert, certVector, EMPTY_CERT_VECTOR, true, certChain); - RUNNER_ASSERT_MSG(CKM_API_SUCCESS == tmp, "Error=" << CKMErrorToString(tmp)); + RUNNER_ASSERT_MSG(CKM_API_SUCCESS == tmp, "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( 3 == certChain.size(), @@ -1357,7 +1357,7 @@ RUNNER_TEST(T13141_ocsp_check_valid_chain) int status; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->ocspCheck(certChain, status)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG(CKM_API_OCSP_STATUS_GOOD == status, "Verfication failed"); } @@ -1423,7 +1423,7 @@ RUNNER_TEST(T13145_ocsp_check_no_ocsp) int status; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->ocspCheck(certVector, status)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG(CKM_API_OCSP_STATUS_UNSUPPORTED == status, "Verfication failed"); } @@ -1505,10 +1505,10 @@ RUNNER_TEST(T1412_RSA_key_create_verify) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPub, keyPub, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPrv, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createSignature( @@ -1518,7 +1518,7 @@ RUNNER_TEST(T1412_RSA_key_create_verify) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -1528,7 +1528,7 @@ RUNNER_TEST(T1412_RSA_key_create_verify) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1413_DSA_key_create_verify) @@ -1580,10 +1580,10 @@ RUNNER_TEST(T1413_DSA_key_create_verify) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPub, keyPub, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPrv, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createSignature( @@ -1593,7 +1593,7 @@ RUNNER_TEST(T1413_DSA_key_create_verify) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -1603,7 +1603,7 @@ RUNNER_TEST(T1413_DSA_key_create_verify) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } @@ -1641,10 +1641,10 @@ RUNNER_TEST(T1414_ECDSA_key_create_verify) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPub, keyPub, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPrv, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createSignature( @@ -1654,7 +1654,7 @@ RUNNER_TEST(T1414_ECDSA_key_create_verify) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -1664,7 +1664,7 @@ RUNNER_TEST(T1414_ECDSA_key_create_verify) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(signature.size() > 6, "Signature is too small"); @@ -1678,7 +1678,7 @@ RUNNER_TEST(T1414_ECDSA_key_create_verify) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1415_RSA_key_create_verify_negative) @@ -1702,7 +1702,7 @@ RUNNER_TEST(T1415_RSA_key_create_verify_negative) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -1712,7 +1712,7 @@ RUNNER_TEST(T1415_RSA_key_create_verify_negative) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(signature.size() > 6, "Signature is too small"); memcpy((void*)signature.data(), "BROKEN", 6); @@ -1725,7 +1725,7 @@ RUNNER_TEST(T1415_RSA_key_create_verify_negative) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1416_DSA_key_create_verify_negative) @@ -1749,7 +1749,7 @@ RUNNER_TEST(T1416_DSA_key_create_verify_negative) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -1759,7 +1759,7 @@ RUNNER_TEST(T1416_DSA_key_create_verify_negative) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(signature.size() > 6, "Signature is too small"); memcpy((void*)signature.data(), "BROKEN", 6); @@ -1772,7 +1772,7 @@ RUNNER_TEST(T1416_DSA_key_create_verify_negative) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1417_RSA_cert_create_verify_signature) @@ -1833,10 +1833,10 @@ RUNNER_TEST(T1417_RSA_cert_create_verify_signature) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveCertificate(aliasPub, cert, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPrv, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createSignature( @@ -1846,7 +1846,7 @@ RUNNER_TEST(T1417_RSA_cert_create_verify_signature) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -1856,7 +1856,7 @@ RUNNER_TEST(T1417_RSA_cert_create_verify_signature) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(signature.size() > 6, "Signature is too small"); @@ -1870,7 +1870,7 @@ RUNNER_TEST(T1417_RSA_cert_create_verify_signature) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1418_DSA_cert_create_verify_signature) @@ -1930,10 +1930,10 @@ RUNNER_TEST(T1418_DSA_cert_create_verify_signature) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveCertificate(aliasPub, cert, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPrv, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createSignature( @@ -1943,7 +1943,7 @@ RUNNER_TEST(T1418_DSA_cert_create_verify_signature) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -1953,7 +1953,7 @@ RUNNER_TEST(T1418_DSA_cert_create_verify_signature) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(signature.size() > 6, "Signature is too small"); @@ -1967,7 +1967,7 @@ RUNNER_TEST(T1418_DSA_cert_create_verify_signature) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1419_ECDSA_cert_create_verify_signature) @@ -2021,10 +2021,10 @@ RUNNER_TEST(T1419_ECDSA_cert_create_verify_signature) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveCertificate(aliasPub, cert, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPrv, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->createSignature( @@ -2034,7 +2034,7 @@ RUNNER_TEST(T1419_ECDSA_cert_create_verify_signature) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -2044,7 +2044,7 @@ RUNNER_TEST(T1419_ECDSA_cert_create_verify_signature) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(signature.size() > 6, "Signature is too small"); @@ -2058,7 +2058,7 @@ RUNNER_TEST(T1419_ECDSA_cert_create_verify_signature) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1420_deinit) @@ -2131,10 +2131,10 @@ RUNNER_TEST(T14180_init) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPub, keyPub, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasPrv, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); // Prepare ECDSA Key Pair std::string ecprv = "-----BEGIN EC PRIVATE KEY-----\n" @@ -2161,10 +2161,10 @@ RUNNER_TEST(T14180_init) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasEcPub, ecKeyPub, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(aliasEcPrv, ecKeyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } @@ -2189,7 +2189,7 @@ RUNNER_TEST(T14181_RSA_create_signatue_nohash) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -2199,7 +2199,7 @@ RUNNER_TEST(T14181_RSA_create_signatue_nohash) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(signature.size() > 6, "Signature is too small"); memcpy((void*)signature.data(), "BROKEN", 6); @@ -2212,7 +2212,7 @@ RUNNER_TEST(T14181_RSA_create_signatue_nohash) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T14182_RSA_create_signatue_nohash_nopad) @@ -2236,7 +2236,7 @@ RUNNER_TEST(T14182_RSA_create_signatue_nohash_nopad) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T14183_RSA_create_signatue_nohash_bigmsg) @@ -2279,7 +2279,7 @@ RUNNER_TEST(T14183_RSA_create_signatue_nohash_bigmsg) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } @@ -2304,7 +2304,7 @@ RUNNER_TEST(T14184_ECDSA_create_signatue_nohash) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -2314,7 +2314,7 @@ RUNNER_TEST(T14184_ECDSA_create_signatue_nohash) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG(signature.size() > 6, "Signature is too small"); @@ -2328,7 +2328,7 @@ RUNNER_TEST(T14184_ECDSA_create_signatue_nohash) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T14185_ECDSA_create_signatue_nohash_bigmsg) @@ -2358,7 +2358,7 @@ RUNNER_TEST(T14185_ECDSA_create_signatue_nohash_bigmsg) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } @@ -2485,11 +2485,11 @@ RUNNER_TEST(T1804_add_PKCS_collision_with_existing_alias) int temp; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(alias_PKCS_collision, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_EXISTS == (temp = manager->savePKCS12(alias_PKCS_collision, pkcs, CKM::Policy(), CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1805_add_bundle_with_chain_certificates) @@ -2529,34 +2529,34 @@ RUNNER_TEST(T1805_add_bundle_with_chain_certificates) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->savePKCS12(alias_PKCS_exportable, pkcs, exportable, exportable)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_EXISTS == (tmp = manager->savePKCS12(alias_PKCS_exportable, pkcs, exportable, exportable)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->savePKCS12(alias_PKCS_not_exportable, pkcs, notExportable, notExportable)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_EXISTS == (tmp = manager->savePKCS12(alias_PKCS_not_exportable, pkcs, notExportable, notExportable)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); // try to lookup key CKM::KeyShPtr key_lookup; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->getKey(alias_PKCS_exportable, CKM::Password(), key_lookup)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_NOT_EXPORTABLE == (tmp = manager->getKey(alias_PKCS_not_exportable, CKM::Password(), key_lookup)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); // try to lookup certificate CKM::CertificateShPtr cert_lookup; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->getCertificate(alias_PKCS_exportable, CKM::Password(), cert_lookup)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_NOT_EXPORTABLE == (tmp = manager->getCertificate(alias_PKCS_not_exportable, CKM::Password(), cert_lookup)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); } RUNNER_TEST(T1806_get_PKCS) @@ -2569,17 +2569,17 @@ RUNNER_TEST(T1806_get_PKCS) // fail - no entry RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (temp = manager->getPKCS12("i-do-not-exist", pkcs)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); // fail - not exportable RUNNER_ASSERT_MSG( CKM_API_ERROR_NOT_EXPORTABLE == (temp = manager->getPKCS12(alias_PKCS_not_exportable, pkcs)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); // success - exportable RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getPKCS12(alias_PKCS_exportable, pkcs)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); auto cert = pkcs->getCertificate(); RUNNER_ASSERT_MSG( @@ -2616,7 +2616,7 @@ RUNNER_TEST(T1807_create_and_verify_signature) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -2626,7 +2626,7 @@ RUNNER_TEST(T1807_create_and_verify_signature) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1808_create_signature_on_raw_key_and_verify_on_PKCS) @@ -2657,7 +2657,7 @@ RUNNER_TEST(T1808_create_signature_on_raw_key_and_verify_on_PKCS) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(alias_PKCS_priv_key_copy, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); CKM::HashAlgorithm hash = CKM::HashAlgorithm::SHA256; CKM::RSAPaddingAlgorithm padd = CKM::RSAPaddingAlgorithm::PKCS1; @@ -2671,7 +2671,7 @@ RUNNER_TEST(T1808_create_signature_on_raw_key_and_verify_on_PKCS) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->verifySignature( @@ -2681,7 +2681,7 @@ RUNNER_TEST(T1808_create_signature_on_raw_key_and_verify_on_PKCS) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1809_create_signature_on_wrong_key_and_verify_on_PKCS) @@ -2713,7 +2713,7 @@ RUNNER_TEST(T1809_create_signature_on_wrong_key_and_verify_on_PKCS) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->saveKey(alias_PKCS_priv_key_wrong, keyPrv, CKM::Policy())), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); CKM::HashAlgorithm hash = CKM::HashAlgorithm::SHA256; CKM::RSAPaddingAlgorithm padd = CKM::RSAPaddingAlgorithm::PKCS1; @@ -2727,7 +2727,7 @@ RUNNER_TEST(T1809_create_signature_on_wrong_key_and_verify_on_PKCS) hash, padd, signature)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_VERIFICATION_FAILED == (temp = manager->verifySignature( @@ -2737,7 +2737,7 @@ RUNNER_TEST(T1809_create_signature_on_wrong_key_and_verify_on_PKCS) signature, hash, padd)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1810_verify_get_certificate_chain) @@ -2771,7 +2771,7 @@ RUNNER_TEST(T1810_verify_get_certificate_chain) true, certChain); RUNNER_ASSERT_MSG(CKM_API_ERROR_VERIFICATION_FAILED == tmp, - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( 0 == certChain.size(), @@ -2780,7 +2780,7 @@ RUNNER_TEST(T1810_verify_get_certificate_chain) aliasVector.push_back(alias_PKCS_exportable); tmp = manager->getCertificateChain(cert, EMPTY_ALIAS_VECTOR, aliasVector, false, certChain); - RUNNER_ASSERT_MSG(CKM_API_SUCCESS == tmp, "Error=" << CKMErrorToString(tmp)); + RUNNER_ASSERT_MSG(CKM_API_SUCCESS == tmp, "Error=" << CKM::APICodeToString(tmp)); // 1(cert) + 1(pkcs12 cert) + 2(pkcs12 chain cert) = 4 RUNNER_ASSERT_MSG( @@ -2797,29 +2797,29 @@ RUNNER_TEST(T1811_remove_bundle_with_chain_certificates) // remove the whole PKCS12 bundles RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->removeAlias(alias_PKCS_exportable)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = manager->removeAlias(alias_PKCS_not_exportable)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); // expect lookup fails due to unknown alias // try to lookup key CKM::KeyShPtr key_lookup; RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (tmp = manager->getKey(alias_PKCS_exportable, CKM::Password(), key_lookup)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (tmp = manager->getKey(alias_PKCS_not_exportable, CKM::Password(), key_lookup)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); // try to lookup certificate CKM::CertificateShPtr cert_lookup; RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (tmp = manager->getCertificate(alias_PKCS_exportable, CKM::Password(), cert_lookup)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == (tmp = manager->getCertificate(alias_PKCS_not_exportable, CKM::Password(), cert_lookup)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); } RUNNER_TEST(T1812_get_pkcs12_password_tests) @@ -2846,32 +2846,32 @@ RUNNER_TEST(T1812_get_pkcs12_password_tests) int temp; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->savePKCS12(alias, pkcs, CKM::Policy(pass1), CKM::Policy(pass2))), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_AUTHENTICATION_FAILED == (temp = manager->getPKCS12(alias, pkcs)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_AUTHENTICATION_FAILED == (temp = manager->getPKCS12(alias, CKM::Password(), CKM::Password(), pkcs)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_AUTHENTICATION_FAILED == (temp = manager->getPKCS12(alias, pass1, CKM::Password(), pkcs)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_ERROR_AUTHENTICATION_FAILED == (temp = manager->getPKCS12(alias, CKM::Password(), pass2, pkcs)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getPKCS12(alias, pass1, pass2, pkcs)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); CKM::CertificateShPtr cert; RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = manager->getCertificate(alias, pass2, cert)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); CKM::CertificateShPtrVector certChain; CKM::AliasVector certVect; @@ -2879,7 +2879,7 @@ RUNNER_TEST(T1812_get_pkcs12_password_tests) RUNNER_ASSERT_MSG( CKM_API_ERROR_AUTHENTICATION_FAILED == (temp = manager->getCertificateChain(cert, certVect, certVect, true, certChain)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST(T1813_deinit) @@ -2889,7 +2889,7 @@ RUNNER_TEST(T1813_deinit) RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (temp = control->lockUserKey(USER_APP)), - "Error=" << CKMErrorToString(temp)); + "Error=" << CKM::APICodeToString(temp)); } RUNNER_TEST_GROUP_INIT(T190_CKM_EMPTY_STORAGE_TESTS); @@ -2912,7 +2912,7 @@ RUNNER_TEST(T1902_get_data) RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_ALIAS_UNKNOWN == status1, - "Could not put certificate in datbase. Error=" << CKMErrorToString(status1)); + "Could not put certificate in datbase. Error=" << CKM::APICodeToString(status1)); } RUNNER_TEST(T1903_lock_database) @@ -2921,7 +2921,7 @@ RUNNER_TEST(T1903_lock_database) auto control = CKM::Control::create(); RUNNER_ASSERT_MSG( CKM_API_SUCCESS == (tmp = control->lockUserKey(USER_APP)), - "Error=" << CKMErrorToString(tmp)); + "Error=" << CKM::APICodeToString(tmp)); } RUNNER_TEST(T1904_get_data_from_locked_database) @@ -2933,7 +2933,7 @@ RUNNER_TEST(T1904_get_data_from_locked_database) RUNNER_ASSERT_MSG( CKM_API_ERROR_DB_LOCKED == status1, - "Could not get key from locked database. Error=" << CKMErrorToString(status1)); + "Could not get key from locked database. Error=" << CKM::APICodeToString(status1)); } RUNNER_TEST(T1905_deinit)