update

Author: ubuntukylin 16

src/GNUmakefile

@@ -1,8 +1,8 @@
 -include config.mk
 
-SHAIFHEPATH ?= $(HOME)/HElib/src
-NTLLIBPATH ?= $(HOME)/ntl-6.0.0-bin/lib
-NTLINCPATH ?= $(HOME)/ntl-6.0.0-bin/include
+SHAIFHEPATH ?= $(HOME)/Documents/HElib/src/
+NTLLIBPATH ?= /usr/local/lib/
+NTLINCPATH ?= /usr/local/include/NTL/
 JSONCPP ?= /usr/include/jsoncpp
 
 L_BOOST_SYSTEM ?= -lboost_system
@@ -35,7 +35,7 @@ CXXFLAGS := $(CXXOPT) -fno-strict-aliasing -fwrapv -fPIC \
 	    -fno-omit-frame-pointer -I$(TOP) -I$(SHAIFHEPATH) -I$(NTLINCPATH) -I$(JSONCPP)
 
 
-LDFLAGS	 := -lpthread -lrt -lgmp -lgmpxx -lgf2x
+LDFLAGS	 := -lpthread -lrt -lgmp -lgmpxx 
 LDFLAGS +=  -L$(TOP)/$(OBJDIR) -Wl,-rpath=$(TOP)/$(OBJDIR)
 
 PROTOC ?= protoc

src/mpc/change_encryption_scheme.cc

@@ -41,8 +41,8 @@ Ctxt Change_ES_FHE_to_GM_A::unblind(const Ctxt &c, const FHEPubKey& publicKey, c
     if (coin_) {
         Ctxt d(c);
 
-        PlaintextArray array(ea);
-        array.encode(1);
+        NewPlaintextArray array(ea);
+        encode(ea,array,1);
         ZZX poly;
         ea.encode(poly,array);
 
@@ -58,8 +58,8 @@ Ctxt Change_ES_FHE_to_GM_A::unblind(const Ctxt &c, const FHEPubKey& publicKey, c
 Ctxt Change_ES_FHE_to_GM_B::decrypt_encrypt(const mpz_class &c, GM_priv &gm, const FHEPubKey &publicKey, const EncryptedArray &ea)
 {
     bool b = gm.decrypt(c);
-    PlaintextArray array(ea);
-    array.encode(b);
+    NewPlaintextArray array(ea);
+    encode(ea,array,b);
 
     Ctxt c0(publicKey);
     ea.encrypt(c0, publicKey, array);
@@ -92,8 +92,8 @@ Ctxt Change_ES_FHE_to_GM_slots_A::unblind(const Ctxt &c, const FHEPubKey& public
 {
     Ctxt d(c);
 
-    PlaintextArray array(ea);
-    array.encode(coins_);
+    NewPlaintextArray array(ea);
+    encode(ea,array,coins_);
     ZZX poly;
     ea.encode(poly,array);
 
@@ -110,12 +110,12 @@ Ctxt Change_ES_FHE_to_GM_slots_B::decrypt_encrypt(const vector<mpz_class> &c, GM
         v[i] = gm.decrypt(c[i]);
     }
 
-    PlaintextArray array(ea);
-    array.encode(v);
+    NewPlaintextArray array(ea);
+    encode(ea,array,v);
 
     Ctxt c0(publicKey);
     ea.encrypt(c0, publicKey, array);
 
     return c0;
 
-}
+}

src/net/protocol_tester.cc

@@ -214,8 +214,8 @@ void Tester_Client::test_fhe()
         bits[i] = gmp_urandomb_ui(rand_state_,1);
     }
 
-    PlaintextArray p0(ea);
-    p0.encode(bits);
+    NewPlaintextArray p0(ea);
+    encode(ea,p0,bits);
     p0.print(cout);
 
     Ctxt c0(*server_fhe_pk_);
@@ -434,7 +434,7 @@ void Tester_Server_session::test_change_es()
     Ctxt c = read_fhe_ctxt_from_socket(socket_, server_->fhe_sk());
 
     EncryptedArray ea(server_->fhe_sk().getContext(), server_->fhe_G());
-    PlaintextArray pp0(ea);
+    NewPlaintextArray pp0(ea);
     ea.decrypt(c, server_->fhe_sk(), pp0);
     cout << id_ << ": Decryption result = " << endl;
     pp0.print(cout);
@@ -453,7 +453,7 @@ void Tester_Server_session::decrypt_fhe()
     Ctxt c = convert_from_message(m, server_->fhe_sk());
 
     EncryptedArray ea(server_->fhe_sk().getContext(), server_->fhe_G());
-    PlaintextArray pp0(ea);
+    NewPlaintextArray pp0(ea);
     ea.decrypt(c, server_->fhe_sk(), pp0);
     cout << id_ << ": Decryption result = " << endl;
     pp0.print(cout);

src/tree/m_variate_poly.cc

@@ -105,8 +105,8 @@ Ctxt evalPoly_FHE_timing(const Multivariate_poly< vector<long> > &poly, const ve
 
     if (s == 0) {
         Ctxt c = Ctxt(pk);
-        PlaintextArray pa(ea);
-        pa.encode(0);
+        NewPlaintextArray pa(ea);
+        encode(ea,pa,0);
         ea.encrypt(c,pk,pa);
         return c;
     }
@@ -143,8 +143,8 @@ Ctxt evalPoly_FHE(const Multivariate_poly< vector<long> > &poly, const vector<Ct
 
     if (s == 0) {
         Ctxt c = Ctxt(pk);
-        PlaintextArray pa(ea);
-        pa.encode(0);
+        NewPlaintextArray pa(ea);
+        encode(ea,pa,0);
         ea.encrypt(c,pk,pa);
         return c;
     }
@@ -156,4 +156,4 @@ Ctxt evalPoly_FHE(const Multivariate_poly< vector<long> > &poly, const vector<Ct
     }
 
     return c;
-}
+}

src/tree/tree.hh

@@ -131,8 +131,8 @@ public:
 static Ctxt ctxt_neg(Ctxt &c, const EncryptedArray &ea)
 {
     Ctxt c_neg(c);
-    PlaintextArray pa(ea);
-    pa.encode(1);
+    NewPlaintextArray pa(ea);
+    encode(ea,pa,1);
     ZZX one;
     ea.encode(one, pa);