add config file compression

Author: mii443

Cargo.lock

@@ -18,3 +18,4 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "*"
 base64 = "*"
 toml = "*"
+flate2 = "1.0.24"

Cargo.toml

@@ -0,0 +1,15 @@
+fn main() {
+    let a = encrypt(16)
+    println("a: " + decrypt(a))
+    let b = encrypt(60)
+    println("b: " + b)
+    let c = encrypt(48)
+    println("c: " + c)
+    let d = encrypt(2)
+    println("d: " + d)
+    let e = encrypt(24)
+    println("e: " + e)
+    let r = a + b + c + d + e
+    println("r: " + decrypt(r));
+    println(decrypt(r) - 15)
+}

client2.gpsl

@@ -1,2 +1 @@
-private_key = "NDM1ODIxMjU2NDA1MTc3NjExNTc0MTk2NjQ5MjUyMzMxMDA5MTMyMjMwNTA1MjA1MTA1OTMzMTA0NjEwODU3MzU3NDg3NDA1Njk5ODU="
-public_key = "eyJQb2ludCI6eyJ4Ijp7InZhbHVlIjoiMHg1NDhlZWQwYzNlYzc5OTJlMzhhODkyNGJjMDk4NTZmZDcwOTNjZDIyZjQ3N2ZjNjA0OGQ3ZWYxNjJhNDM3Y2UiLCJwIjoiMHhmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZWZmZmZmYzJmIn0sInkiOnsidmFsdWUiOiIweGU3OTVlNGZmMDdlOTYyYmUzNzFlYmJhYWVlYWI2ZDBkZmVlNjg5YmQ3MzlmYjk5MGI1NmE0NDQxZTJhZGFiNzIiLCJwIjoiMHhmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZWZmZmZmYzJmIn0sImEiOnsidmFsdWUiOiIweDAiLCJwIjoiMHhmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZWZmZmZmYzJmIn0sImIiOnsidmFsdWUiOiIweDciLCJwIjoiMHhmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZWZmZmZmYzJmIn19fQ=="
+碜뵒䅎쌰Ⴜꨯ䡓߄ꆇ뙎升ꦜӻ艨娒㬉咈꿇₸⨟훚駕桦긿鼿蹏鰬♓ိǗ컀⻤쀅댿镦ϐ頠쵆烌ꊓΚꗧ搞娏䢫Ⴉ鲁愁᜵証읣䬿錑ニ࡝瓞瞺䀘㶎榶ྻ쵮ﶟび멣꾪�讎餷ෛ㪀逑ᦦ䚕麗滗䤁嘉ᘨ鎏訞谴䖋渹䌑ߘ莅撣唉玠⬃滗䪡೶餅坛䱶븇葩ꬫ꿉첊ꣾ뽞慔㪽罘ꟑԿ猔鬎쨼�ܾ쿂胀延㋲壏椵䂏ⶈ��㲉觟迥ꖌ㡍᭰蕆뫺噪糦๝殯맠�劖ퟐ繹೼�Ǹ眣�

gpsl_conf.toml

@@ -112,6 +112,7 @@ pub const STD_FUNC: fn(
             };
             let ec = encryption.plain_to_ec_point(plain);
             let eep = encryption.encrypt(ec, data.public_key.unwrap(), None);
+            println!("{}", ec);
             ExternalFuncReturn {
                 status: ExternalFuncStatus::SUCCESS,
                 value: Some(Variable::PureEncrypted { value: eep }),
@@ -124,6 +125,7 @@ pub const STD_FUNC: fn(
                 _ => panic!("decrypt: first argument must be a pure encrypted point"),
             };
             let plain = Encryption::decrypt(eep, data.private_key.unwrap());
+            println!("{}", plain);
             let plain = encryption.ec_point_to_plain(plain);
             ExternalFuncReturn {
                 status: ExternalFuncStatus::SUCCESS,

src/gpsl/external_function.rs

@@ -5,6 +5,9 @@ use common::finite_field::FiniteFieldElement;
 use elliptic_curve::elliptic_curve::EllipticCurve;
 use elliptic_curve::elliptic_curve::EllipticCurvePoint;
 use elliptic_curve::encryption::Encryption;
+use flate2::read::ZlibDecoder;
+use flate2::write::ZlibEncoder;
+use flate2::Compression;
 use gpsl::external_function::ExternalFuncReturn;
 use gpsl::external_function::ExternalFuncStatus;
 use gpsl::node::Node;
@@ -17,6 +20,7 @@ use serde::Deserialize;
 use serde::Serialize;
 use std::env;
 use std::fs::File;
+use std::io::prelude::*;
 use std::io::BufRead;
 use std::io::BufReader;
 use std::io::Read;
@@ -71,9 +75,12 @@ struct Config {
 impl Config {
     fn read_file(file: &str) -> String {
         let mut file = fs::File::open(file).unwrap();
-        let mut contents = String::new();
-        file.read_to_string(&mut contents).unwrap();
-        contents
+        let mut contents = Vec::new();
+        file.read_to_end(&mut contents).unwrap();
+        let mut d = ZlibDecoder::new(&contents[..]);
+        let mut s = String::new();
+        d.read_to_string(&mut s).unwrap();
+        s
     }
     pub fn from_file(file: &str) -> Self {
         let file = Config::read_file(file);
@@ -83,7 +90,7 @@ impl Config {
             if let Some(private_key) = config.private_key {
                 let decoded = base64::decode(&private_key).unwrap();
                 let s = std::str::from_utf8(&decoded).unwrap();
-                Some(U512::from_str(s).unwrap())
+                Some(U512::from_str_radix(s, 10).unwrap())
             } else {
                 None
             }
@@ -93,7 +100,8 @@ impl Config {
             if let Some(public_key) = config.public_key {
                 let decoded = base64::decode(&public_key).unwrap();
                 let s = std::str::from_utf8(&decoded).unwrap();
-                Some(EllipticCurvePoint::from_str(s).unwrap())
+                let r = EllipticCurvePoint::from_str(s).unwrap();
+                Some(r)
             } else {
                 None
             }
@@ -113,7 +121,7 @@ impl Config {
 [Mod(4767914906170010398, 6139062703770505681), Mod(2445476831433994309, 6139062703770505681)]]]
  */
 
-fn main() {
+fn o_main() {
     let p = U512::from_str_radix("1009", 10).unwrap();
 
     let secp256_k1_a = FiniteFieldElement::new(U512::from(37u8), p);
@@ -139,6 +147,7 @@ fn main() {
             b: secp256_k1_b,
         }
     };
+
     let r = U512::from_str_radix("7", 10).unwrap();
 
     let f = EllipticCurvePoint::weil(pp, pd, r);
@@ -149,11 +158,11 @@ fn main() {
     let q = pp * s;
     let qd = pd * sd;
 
-    let ra = U512::from_str_radix("1", 10).unwrap();
+    let ra = U512::from_str_radix("20", 10).unwrap();
     let rad = U512::from_str_radix("26", 10).unwrap();
 
     let m = U512::from_str_radix("2", 10).unwrap();
-    let md = U512::from_str_radix("3", 10).unwrap();
+    let md = U512::from_str_radix("2", 10).unwrap();
 
     let s1 = pp * m + q * ra;
     let t1 = pp * ra;
@@ -264,7 +273,7 @@ fn generate_encryption() -> Encryption {
     }
 }
 
-fn o_main() {
+fn main() {
     env::set_var("RUST_LOG", "info");
     env_logger::init();
     let args = Args::parse();
@@ -434,8 +443,10 @@ fn client(args: Args) {
 
         let mut file = File::create("gpsl_conf.toml").unwrap();
         let config_file = ConfigFile::from_config(config.clone());
-        file.write_all(serde_json::to_string(&config_file).unwrap().as_bytes())
+        let mut e = ZlibEncoder::new(Vec::new(), Compression::default());
+        e.write_all(toml::to_string(&config_file).unwrap().as_bytes())
             .unwrap();
+        file.write_all(&e.finish().unwrap()).unwrap();
 
         config
     };