cpu gate is wrong

vernamlab · Mar 26, 2018 · 7c3ef4d · 7c3ef4d
1 parent 9b0c147
commit 7c3ef4d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/cufhe/Makefile b/cufhe/Makefile
@@ -43,9 +43,9 @@ $(DIR_OBJ)/test/test_api_cpu.o: test/test_api_cpu.cc
 	$(CC) $(FLAGS) $(INC) -M -o $(@:%.o=%.d) $<
 	$(CC) $(FLAGS) $(INC) -c -o $@ $<
 
-$(DIR_BIN)/test_api_gpu: $(DIR_OBJ)/test/test_api_gpu.o
+$(DIR_BIN)/test_api_gpu: $(DIR_OBJ)/test/test_api_gpu.o $(DIR_OBJ)/cufhe_io.o
 	$(dir_guard)
-	$(CU) $(FLAGS) -o $@ $(DIR_OBJ)/test/test_api_gpu.o -L$(DIR_BIN) -lcufhe_gpu
+	$(CU) $(FLAGS) -o $@ $(DIR_OBJ)/test/test_api_gpu.o $(DIR_OBJ)/cufhe_io.o -L$(DIR_BIN) -lcufhe_gpu
 
 $(DIR_OBJ)/test/test_api_gpu.o: test/test_api_gpu.cu
 	$(dir_guard)

diff --git a/cufhe/test/test_api_cpu.cc b/cufhe/test/test_api_cpu.cc
@@ -52,10 +52,24 @@ int main() {
   // Same for Ctxt.
   PriKey pri_key;
   PubKey pub_key;
-  WritePriKeyToFile(pri_key_old, "data/pri_key.txt");
-  WritePubKeyToFile(pub_key_old, "data/pub_key.txt");
-  ReadPriKeyFromFile(pri_key, "data/pri_key.txt");
-  ReadPubKeyFromFile(pub_key, "data/pub_key.txt");
+  WritePriKeyToFile(pri_key_old, "pri_key.txt");
+  WritePubKeyToFile(pub_key_old, "pub_key.txt");
+  ReadPriKeyFromFile(pri_key, "pri_key.txt");
+  ReadPubKeyFromFile(pub_key, "pub_key.txt");
+
+  for (int i = 0; i <= pub_key_old.bk_->SizeData() / 4; i ++) {
+    if (pub_key_old.bk_->data()[i] != pub_key.bk_->data()[i]) {
+      cout<< "Wrong Boot Key" <<endl;
+      break;
+    }
+  }
+
+  for (int i = 0; i < pub_key_old.ksk_->SizeData() / 4; i ++) {
+    if (pub_key_old.ksk_->data()[i] != pub_key.ksk_->data()[i]) {
+      cout<< "Wrong KeySwitch Key" <<endl;
+      break;
+    }
+  }
 
   cout<< "------ Test Encryption/Decryption ------" <<endl;
   cout<< "Number of tests:\t" << kNumTests <<endl;

diff --git a/cufhe/test/test_api_gpu.cu b/cufhe/test/test_api_gpu.cu
@@ -52,18 +52,24 @@ int main() {
 
   SetSeed(); // set random seed
 
-  PriKey pri_key; // private key
-  PubKey pub_key; // public key
+  PriKey pri_key_old; // private key
+  PubKey pub_key_old; // public key
   Ptxt* pt = new Ptxt[2 * kNumTests];
   Ctxt* ct = new Ctxt[2 * kNumTests];
   cudaDeviceSynchronize();
   bool correct;
 
   cout<< "------ Key Generation ------" <<endl;
-  KeyGen(pub_key, pri_key);
+  KeyGen(pub_key_old, pri_key_old);
   // Alternatively ...
   // PriKeyGen(pri_key);
   // PubKeyGen(pub_key, pri_key);
+  WritePriKeyToFile(pri_key_old, "pri_key.txt");
+  WritePubKeyToFile(pub_key_old, "pub_key.txt");
+  PriKey pri_key; // private key
+  PubKey pub_key; // public key
+  ReadPriKeyFromFile(pri_key, "pri_key.txt");
+  ReadPubKeyFromFile(pub_key, "pub_key.txt");
 
   cout<< "------ Test Encryption/Decryption ------" <<endl;
   cout<< "Number of tests:\t" << kNumTests <<endl;