Skip to content

Commit

Permalink
fix bug in ck encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
tianyuan129 committed Jul 5, 2023
1 parent 39d8ddc commit 5c379f2
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/producer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Producer::ckDataGen(const Policy& accessPolicy,
ckName.append(CONTENT_KEY).append(std::to_string(random::generateSecureWord32()));

Name ckDataName = ckName;
ckDataName.append(ENCRYPT_BY).append(accessPolicy);
ckDataName.append(ENCRYPT_BY).append(accessPolicy.c_str());
auto ckData = std::move(dataTemplate);
ckData->setName(ckDataName);
ckData->setContent(contentKey->makeCKContent());
Expand Down
26 changes: 26 additions & 0 deletions tests/unit-tests/producer.t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,32 @@ BOOST_AUTO_TEST_CASE(KpEncryptContent)
BOOST_CHECK(ckData != nullptr);
}

BOOST_AUTO_TEST_CASE(AccessPolicy)
{
algo::PublicParams pubParams;
algo::MasterKey masterKey;
security::ValidatorConfig validator(c1);
validator.load("trust-schema.conf");
Producer producer(c1, m_keyChain, validator, producerCert, authorityCert);
advanceClocks(time::milliseconds(20), 60);
algo::ABESupport::getInstance().cpInit(pubParams, masterKey);

BOOST_CHECK(pubParams.m_pub != "");
BOOST_CHECK(masterKey.m_msk != "");

producer.m_paramFetcher.m_pubParamsCache = pubParams;
producer.m_paramFetcher.m_abeType = ABE_TYPE_CP_ABE;
// generate prv key
std::vector<std::string> attrList = {"attr1", "attr2", "attr3", "attr4", "attr5",
"attr6", "attr7", "attr8", "attr9", "attr10"};
algo::PrivateKey prvKey = algo::ABESupport::getInstance().cpPrvKeyGen(pubParams, masterKey, attrList);

std::shared_ptr<Data> data, ckData;
std::tie(data, ckData) = producer.produce(Name("/dataset1/example/data1"), "attr >= 629927339", PLAIN_TEXT, signingInfo);
BOOST_CHECK(data != nullptr);
BOOST_CHECK(ckData != nullptr);
}

BOOST_AUTO_TEST_SUITE_END()

} // namespace tests
Expand Down

0 comments on commit 5c379f2

Please sign in to comment.