From cc82b60b24302203fb3648170cda29330a167f66 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 12 Jan 2022 21:23:08 +0300 Subject: [PATCH] Don't use implicitly namespace td in SecureStorage tests. --- test/secure_storage.cpp | 54 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/test/secure_storage.cpp b/test/secure_storage.cpp index d0c100a75..774dead5a 100644 --- a/test/secure_storage.cpp +++ b/test/secure_storage.cpp @@ -12,37 +12,34 @@ #include "td/utils/SliceBuilder.h" #include "td/utils/tests.h" -using namespace td; - TEST(SecureStorage, secret) { - using namespace td::secure_storage; - auto secret = Secret::create_new(); - std::string key = "cucumber"; - auto encrypted_secret = secret.encrypt(key, "", secure_storage::EnryptionAlgorithm::Sha512); + auto secret = td::secure_storage::Secret::create_new(); + td::string key = "cucumber"; + auto encrypted_secret = secret.encrypt(key, "", td::secure_storage::EnryptionAlgorithm::Sha512); ASSERT_TRUE(encrypted_secret.as_slice() != secret.as_slice()); - auto decrypted_secret = encrypted_secret.decrypt(key, "", secure_storage::EnryptionAlgorithm::Sha512).ok(); + auto decrypted_secret = encrypted_secret.decrypt(key, "", td::secure_storage::EnryptionAlgorithm::Sha512).ok(); ASSERT_TRUE(secret.as_slice() == decrypted_secret.as_slice()); - ASSERT_TRUE(encrypted_secret.decrypt("notcucumber", "", secure_storage::EnryptionAlgorithm::Sha512).is_error()); + ASSERT_TRUE(encrypted_secret.decrypt("notcucumber", "", td::secure_storage::EnryptionAlgorithm::Sha512).is_error()); } TEST(SecureStorage, simple) { - using namespace td::secure_storage; - - BufferSlice value("Small tale about cucumbers"); - auto value_secret = Secret::create_new(); + td::BufferSlice value("Small tale about cucumbers"); + auto value_secret = td::secure_storage::Secret::create_new(); { - BufferSliceDataView value_view(value.copy()); - BufferSlice prefix = gen_random_prefix(value_view.size()); - BufferSliceDataView prefix_view(std::move(prefix)); - ConcatDataView full_value_view(prefix_view, value_view); - auto hash = calc_value_hash(full_value_view).move_as_ok(); + td::secure_storage::BufferSliceDataView value_view(value.copy()); + td::BufferSlice prefix = td::secure_storage::gen_random_prefix(value_view.size()); + td::secure_storage::BufferSliceDataView prefix_view(std::move(prefix)); + td::secure_storage::ConcatDataView full_value_view(prefix_view, value_view); + auto hash = td::secure_storage::calc_value_hash(full_value_view).move_as_ok(); - Encryptor encryptor(calc_aes_cbc_state_sha512(PSLICE() << value_secret.as_slice() << hash.as_slice()), - full_value_view); + td::secure_storage::Encryptor encryptor( + td::secure_storage::calc_aes_cbc_state_sha512(PSLICE() << value_secret.as_slice() << hash.as_slice()), + full_value_view); auto encrypted_value = encryptor.pread(0, encryptor.size()).move_as_ok(); - Decryptor decryptor(calc_aes_cbc_state_sha512(PSLICE() << value_secret.as_slice() << hash.as_slice())); + td::secure_storage::Decryptor decryptor( + td::secure_storage::calc_aes_cbc_state_sha512(PSLICE() << value_secret.as_slice() << hash.as_slice())); auto res = decryptor.append(encrypted_value.copy()).move_as_ok(); auto decrypted_hash = decryptor.finish().ok(); ASSERT_TRUE(decrypted_hash.as_slice() == hash.as_slice()); @@ -50,23 +47,24 @@ TEST(SecureStorage, simple) { } { - auto encrypted_value = encrypt_value(value_secret, value.as_slice()).move_as_ok(); + auto encrypted_value = td::secure_storage::encrypt_value(value_secret, value.as_slice()).move_as_ok(); auto decrypted_value = - decrypt_value(value_secret, encrypted_value.hash, encrypted_value.data.as_slice()).move_as_ok(); + td::secure_storage::decrypt_value(value_secret, encrypted_value.hash, encrypted_value.data.as_slice()) + .move_as_ok(); ASSERT_TRUE(decrypted_value.as_slice() == value.as_slice()); } { - std::string value_path = "value.txt"; - std::string encrypted_path = "encrypted.txt"; - std::string decrypted_path = "decrypted.txt"; + td::string value_path = "value.txt"; + td::string encrypted_path = "encrypted.txt"; + td::string decrypted_path = "decrypted.txt"; td::unlink(value_path).ignore(); td::unlink(encrypted_path).ignore(); td::unlink(decrypted_path).ignore(); - std::string file_value(100000, 'a'); + td::string file_value(100000, 'a'); td::write_file(value_path, file_value).ensure(); - auto hash = encrypt_file(value_secret, value_path, encrypted_path).move_as_ok(); - decrypt_file(value_secret, hash, encrypted_path, decrypted_path).ensure(); + auto hash = td::secure_storage::encrypt_file(value_secret, value_path, encrypted_path).move_as_ok(); + td::secure_storage::decrypt_file(value_secret, hash, encrypted_path, decrypted_path).ensure(); ASSERT_TRUE(td::read_file(decrypted_path).move_as_ok().as_slice() == file_value); } }