projects
/
platform
/
core
/
security
/
key-manager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto-service key generation contents moved into SW backend.
[platform/core/security/key-manager.git]
/
tests
/
DBFixture.cpp
diff --git
a/tests/DBFixture.cpp
b/tests/DBFixture.cpp
index
20e1a43
..
2a7238a
100644
(file)
--- a/
tests/DBFixture.cpp
+++ b/
tests/DBFixture.cpp
@@
-32,7
+32,7
@@
void DBFixture::init()
high_resolution_clock::time_point srand_feed = high_resolution_clock::now();
srand(srand_feed.time_since_epoch().count());
high_resolution_clock::time_point srand_feed = high_resolution_clock::now();
srand(srand_feed.time_since_epoch().count());
- BOOST_REQUIRE_NO_THROW(m_db = DBCrypto(m_crypto_db_fname, defaultPass));
+ BOOST_REQUIRE_NO_THROW(m_db = DB
::
Crypto(m_crypto_db_fname, defaultPass));
}
double DBFixture::performance_get_time_elapsed_ms()
}
double DBFixture::performance_get_time_elapsed_ms()
@@
-73,7
+73,7
@@
void DBFixture::generate_label(unsigned int id, Label & output)
void DBFixture::generate_perf_DB(unsigned int num_name, unsigned int num_elements)
{
// to speed up data creation - cache the row
void DBFixture::generate_perf_DB(unsigned int num_name, unsigned int num_elements)
{
// to speed up data creation - cache the row
- DB
Row rowPattern = create_default_row(DB
DataType::BINARY_DATA);
+ DB
::Row rowPattern = create_default_row(
DataType::BINARY_DATA);
rowPattern.data = RawBuffer(100, 20);
rowPattern.dataSize = rowPattern.data.size();
rowPattern.tag = RawBuffer(AES_GCM_TAG_SIZE, 1);
rowPattern.data = RawBuffer(100, 20);
rowPattern.dataSize = rowPattern.data.size();
rowPattern.tag = RawBuffer(AES_GCM_TAG_SIZE, 1);
@@
-83,7
+83,7
@@
void DBFixture::generate_perf_DB(unsigned int num_name, unsigned int num_element
generate_name(i, rowPattern.name);
generate_label(i/num_elements, rowPattern.ownerLabel);
generate_name(i, rowPattern.name);
generate_label(i/num_elements, rowPattern.ownerLabel);
- BOOST_REQUIRE_NO_THROW(m_db.save
DB
Row(rowPattern));
+ BOOST_REQUIRE_NO_THROW(m_db.saveRow(rowPattern));
}
}
}
}
@@
-113,16
+113,16
@@
long DBFixture::add_full_access_rights(unsigned int num_name, unsigned int num_n
return iterations;
}
return iterations;
}
-DB
Row DBFixture::create_default_row(DB
DataType type)
+DB
::Row DBFixture::create_default_row(
DataType type)
{
return create_default_row(m_default_name, m_default_label, type);
}
{
return create_default_row(m_default_name, m_default_label, type);
}
-DBRow DBFixture::create_default_row(const Name &name,
+DB
::
Row DBFixture::create_default_row(const Name &name,
const Label &label,
const Label &label,
- D
BD
ataType type)
+ DataType type)
{
{
- DBRow row;
+ DB
::
Row row;
row.name = name;
row.ownerLabel = label;
row.exportable = 1;
row.name = name;
row.ownerLabel = label;
row.exportable = 1;
@@
-131,11
+131,12
@@
DBRow DBFixture::create_default_row(const Name &name,
row.iv = createDefaultPass();
row.encryptionScheme = 0;
row.dataSize = 0;
row.iv = createDefaultPass();
row.encryptionScheme = 0;
row.dataSize = 0;
+ row.backendId = CryptoBackend::OpenSSL;
return row;
}
return row;
}
-void DBFixture::compare_row(const DB
Row &lhs, const DB
Row &rhs)
+void DBFixture::compare_row(const DB
::Row &lhs, const DB::
Row &rhs)
{
BOOST_CHECK_MESSAGE(lhs.name == rhs.name,
"namees didn't match! Got: " << rhs.name
{
BOOST_CHECK_MESSAGE(lhs.name == rhs.name,
"namees didn't match! Got: " << rhs.name
@@
-156,28
+157,31
@@
void DBFixture::compare_row(const DBRow &lhs, const DBRow &rhs)
BOOST_CHECK_MESSAGE(lhs.data == rhs.data,
"data didn't match! Got: " << rhs.data.size()
<< " , expected : " << lhs.data.size());
BOOST_CHECK_MESSAGE(lhs.data == rhs.data,
"data didn't match! Got: " << rhs.data.size()
<< " , expected : " << lhs.data.size());
+
+ BOOST_CHECK_MESSAGE(lhs.backendId == rhs.backendId,
+ "backendId didn't match! Got: " << static_cast<int>(rhs.backendId)
+ << " , expected : " << static_cast<int>(lhs.backendId));
}
}
-void DBFixture::check_DB_integrity(const DBRow &rowPattern)
+void DBFixture::check_DB_integrity(const DB
::
Row &rowPattern)
{
{
- BOOST_REQUIRE_NO_THROW(m_db.saveDBRow(rowPattern));
- DBRow selectRow = rowPattern;
+ BOOST_REQUIRE_NO_THROW(m_db.saveRow(rowPattern));
- DB
Crypto::DB
RowOptional optional_row;
- BOOST_REQUIRE_NO_THROW(optional_row = m_db.get
DBRow("name", "label", DB
DataType::BINARY_DATA));
+ DB
::Crypto::
RowOptional optional_row;
+ BOOST_REQUIRE_NO_THROW(optional_row = m_db.get
Row("name", "label",
DataType::BINARY_DATA));
BOOST_REQUIRE_MESSAGE(optional_row, "Select didn't return any row");
BOOST_REQUIRE_MESSAGE(optional_row, "Select didn't return any row");
- compare_row(
selectR
ow, rowPattern);
- DBRow name_duplicate = rowPattern;
+ compare_row(
*optional_r
ow, rowPattern);
+ DB
::
Row name_duplicate = rowPattern;
name_duplicate.data = createDefaultPass();
name_duplicate.dataSize = name_duplicate.data.size();
unsigned int erased;
name_duplicate.data = createDefaultPass();
name_duplicate.dataSize = name_duplicate.data.size();
unsigned int erased;
- BOOST_REQUIRE_NO_THROW(erased = m_db.delete
DB
Row("name", "label"));
+ BOOST_REQUIRE_NO_THROW(erased = m_db.deleteRow("name", "label"));
BOOST_REQUIRE_MESSAGE(erased > 0, "Inserted row didn't exist in db");
BOOST_REQUIRE_MESSAGE(erased > 0, "Inserted row didn't exist in db");
- DB
Crypto::DB
RowOptional row_optional;
- BOOST_REQUIRE_NO_THROW(row_optional = m_db.get
DBRow("name", "label", DB
DataType::BINARY_DATA));
+ DB
::Crypto::
RowOptional row_optional;
+ BOOST_REQUIRE_NO_THROW(row_optional = m_db.get
Row("name", "label",
DataType::BINARY_DATA));
BOOST_REQUIRE_MESSAGE(!row_optional, "Select should not return row after deletion");
}
BOOST_REQUIRE_MESSAGE(!row_optional, "Select should not return row after deletion");
}
@@
-188,17
+192,17
@@
void DBFixture::insert_row()
void DBFixture::insert_row(const Name &name, const Label &owner_label)
{
void DBFixture::insert_row(const Name &name, const Label &owner_label)
{
- DB
Row rowPattern = create_default_row(name, owner_label, DB
DataType::BINARY_DATA);
+ DB
::Row rowPattern = create_default_row(name, owner_label,
DataType::BINARY_DATA);
rowPattern.data = RawBuffer(100, 20);
rowPattern.dataSize = rowPattern.data.size();
rowPattern.tag = RawBuffer(AES_GCM_TAG_SIZE, 1);
rowPattern.data = RawBuffer(100, 20);
rowPattern.dataSize = rowPattern.data.size();
rowPattern.tag = RawBuffer(AES_GCM_TAG_SIZE, 1);
- BOOST_REQUIRE_NO_THROW(m_db.save
DB
Row(rowPattern));
+ BOOST_REQUIRE_NO_THROW(m_db.saveRow(rowPattern));
}
void DBFixture::delete_row(const Name &name, const Label &owner_label)
{
bool exit_flag;
}
void DBFixture::delete_row(const Name &name, const Label &owner_label)
{
bool exit_flag;
- BOOST_REQUIRE_NO_THROW(exit_flag = m_db.delete
DB
Row(name, owner_label));
+ BOOST_REQUIRE_NO_THROW(exit_flag = m_db.deleteRow(name, owner_label));
BOOST_REQUIRE_MESSAGE(true == exit_flag, "remove name failed: no rows removed");
}
BOOST_REQUIRE_MESSAGE(true == exit_flag, "remove name failed: no rows removed");
}
@@
-212,8
+216,8
@@
void DBFixture::add_permission(const Name &name, const Label &owner_label, const
void DBFixture::read_row_expect_success(const Name &name, const Label &owner_label)
{
void DBFixture::read_row_expect_success(const Name &name, const Label &owner_label)
{
- DB
Crypto::DB
RowOptional row;
- BOOST_REQUIRE_NO_THROW(row = m_db.get
DBRow(name, owner_label, DB
DataType::BINARY_DATA));
+ DB
::Crypto::
RowOptional row;
+ BOOST_REQUIRE_NO_THROW(row = m_db.get
Row(name, owner_label,
DataType::BINARY_DATA));
BOOST_REQUIRE_MESSAGE(row, "row is empty");
BOOST_REQUIRE_MESSAGE(row->name == name, "name is not valid");
}
BOOST_REQUIRE_MESSAGE(row, "row is empty");
BOOST_REQUIRE_MESSAGE(row->name == name, "name is not valid");
}