updat

.gitignore

@@ -30,3 +30,4 @@ packages/tls/mysqlWrapper/createSelect
 packages/tls/mysqlWrapper/main
 *allTables*
 *pipelinefile*
+*.conf

debug/test_ASHE.cc

@@ -3,7 +3,7 @@
 #include "crypto/ASHE.hh"
 #include "util/util.cc"
 int main(){
-    const int num_of_tests = 100;
+    const int num_of_tests = 32768;
     unsigned int seed = 1u;
     std::vector<unsigned int> plain;
     std::vector<RAW_ASHE> ass;
@@ -14,7 +14,7 @@ int main(){
         ass.push_back(RAW_ASHE(IV));
         ass.back().encrypt(seed,IV);
         unsigned int res = ass.back().decrypt(ass.back().get_ciphertext(),IV);
-        if(res==seed) std::cout<<"pass"<<std::endl;
+        if(res==seed) ;
         else std::cout<<"not pass!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<<std::endl;
         seed++;
     }

packages/operation/random_insert.sh

+##echo $(rand 0 65535)
+function rand(){  
+    min=$1  
+    max=$(($2-$min+1))  
+    num=$(($RANDOM+1000000000)) #增加一个10位的数再求余  
+    echo $(($num%$max+$min))  
+}
+
+
+
+
+##[0, 32767]
 function generate_insert_int(){
     head=$1
     pipe=$2

wrapper/reuse.cc

@@ -387,7 +387,6 @@ STORE_STRATEGY currentStrategy = STORE_STRATEGY::ALL;
 
 /*storage used when we store*/
 void storeStrategies(std::vector<FieldMetaTrans>& res){    
-
     if(currentStrategy == STORE_STRATEGY::FIRST){
         std::vector<int> in{0};
         for(auto &item:res){
@@ -410,10 +409,8 @@ void storeStrategies(std::vector<FieldMetaTrans>& res){
 static const std::vector<onion> onion_order = {
         oDET,
         oOPE,
-        oAGG, 
         oASHE,
-        oSWP,
-        oPLAIN
+        oAGG, 
 };
 
 int getDecryptionOnionIndex(FieldMetaTrans& fdtrans) {