remove memory leak in SWP

debug/test_layer_SWP.cc

@@ -140,6 +140,7 @@ main(int argc,char**argv) {
         Item* plain = getItemString(input);
         auto res = tokenize(input);
         control(sw, plain, num_of_tests, length*i,res->size());
+        delete res;
     }
     return 0;
 }

main/CryptoHandlers.cc

@@ -1479,7 +1479,7 @@ Search::encrypt(const Item &ptext, uint64_t IV) const
     //TODO: remove string, string serves this purpose now..
     const std::list<std::string> * const tokens = tokenize(plainstr);
     const std::string ciph = encryptSWP(key, *tokens);
-
+    delete tokens;
     LOG(encl) << "SEARCH encrypt " << plainstr << " --> " << ciph;
 
     return new Item_string(newmem(ciph), ciph.length(), &my_charset_bin);

wrapper/reuse.cc

@@ -593,8 +593,8 @@ void storeStrategies(std::vector<FieldMetaTrans>& res){
 
 
 static const std::vector<onion> onion_order = {
-        oDET,
         oASHE,
+        oDET,
         oOPE,
         oAGG, 
 };