Skip to content

P
Practical-Cryptdb
Commit dd228f42 authored by yiwenshao's avatar yiwenshao
Browse files
Options

stable version befor we want to add layers for ASHE

parent eddfc8c1
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 17 deletions
debug/test_insertHandler.cc
View file @ dd228f42
...@@ -51,7 +51,7 @@ main() { ...@@ -51,7 +51,7 @@ main() {
ConnectionInfo ci("localhost", "root", "letmein",3306); ConnectionInfo ci("localhost", "root", "letmein",3306);
SharedProxyState *shared_ps = new SharedProxyState(ci, embeddedDir , master_key, determineSecurityRating()); SharedProxyState *shared_ps = new SharedProxyState(ci, embeddedDir , master_key, determineSecurityRating());
assert(shared_ps!=NULL); assert(shared_ps!=NULL);
std::string query1 = "insert into student values(1,\"zhangfei ZHAO DADKLAS DFASLFKDJS\")"; std::string query1 = "insert into child values(1,\"zh Z D D\")";
std::vector<std::string> querys{query1}; std::vector<std::string> querys{query1};
for(auto item:querys){ for(auto item:querys){
std::cout<<item<<std::endl; std::cout<<item<<std::endl;
......
util/onions.cc
View file @ dd228f42
...@@ -8,13 +8,7 @@ onionlayout PLAIN_ONION_LAYOUT = { ...@@ -8,13 +8,7 @@ onionlayout PLAIN_ONION_LAYOUT = {
{oPLAIN, std::vector<SECLEVEL>({SECLEVEL::PLAINVAL})} {oPLAIN, std::vector<SECLEVEL>({SECLEVEL::PLAINVAL})}
}; };
/***************************ofthen used*******************************************************/
/*******************************************************************************************
***************************** Onion layout for numeric data ********************************
********************************************************************************************
*/
//static
onionlayout NUM_ONION_LAYOUT = { onionlayout NUM_ONION_LAYOUT = {
{oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET, {oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET,
SECLEVEL::RND})}, SECLEVEL::RND})},
...@@ -22,6 +16,22 @@ onionlayout NUM_ONION_LAYOUT = { ...@@ -22,6 +16,22 @@ onionlayout NUM_ONION_LAYOUT = {
{oAGG, std::vector<SECLEVEL>({SECLEVEL::HOM})} {oAGG, std::vector<SECLEVEL>({SECLEVEL::HOM})}
}; };
onionlayout STR_ONION_LAYOUT = {
{oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET,
SECLEVEL::RND})},
{oOPE, std::vector<SECLEVEL>({SECLEVEL::OPEFOREIGN, SECLEVEL::OPE, SECLEVEL::RND})},
{oSWP, std::vector<SECLEVEL>({SECLEVEL::SEARCH})}
// {oSWP, std::vector<SECLEVEL>({SECLEVEL::PLAINVAL, SECLEVEL::DET,
// SECLEVEL::RND})}
};
/*******************************************************************************************
***************************** Onion layout for numeric data ********************************
********************************************************************************************
*/
//static //static
onionlayout NUM_ONION_LAYOUT_NOFOREIGN = { onionlayout NUM_ONION_LAYOUT_NOFOREIGN = {
{oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET, {oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET,
...@@ -83,15 +93,6 @@ onionlayout NUM_ONION_LAYOUT_TEST{ ...@@ -83,15 +93,6 @@ onionlayout NUM_ONION_LAYOUT_TEST{
********************************************************************************************* *********************************************************************************************
*/ */
//static
onionlayout STR_ONION_LAYOUT = {
{oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET,
SECLEVEL::RND})},
{oOPE, std::vector<SECLEVEL>({SECLEVEL::OPEFOREIGN, SECLEVEL::OPE, SECLEVEL::RND})},
{oSWP, std::vector<SECLEVEL>({SECLEVEL::SEARCH})}
// {oSWP, std::vector<SECLEVEL>({SECLEVEL::PLAINVAL, SECLEVEL::DET,
// SECLEVEL::RND})}
};
//static //static
onionlayout STR_ONION_LAYOUT_WITHSEARCH{ onionlayout STR_ONION_LAYOUT_WITHSEARCH{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment