rabe-console v0.4.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rabe"
-version = "0.4.0"
+version = "0.4.1"
 description = "ABE Schemes implemented in rust."
 authors = [
     "Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>",
@@ -16,8 +16,8 @@ documentation = "https://docs.rs/rabe"
 
 [features]
 default = ["serde"]
-borsh = ["borsh/std", "rabe-bn/borsh"]
-serde = ["serde/std", "rabe-bn/serde"]
+borsh = ["borsh/derive", "rabe-bn/borsh"]
+serde = ["serde/derive", "rabe-bn/serde"]
 
 [lib]
 name="rabe"
@@ -26,13 +26,13 @@ path = "src/lib.rs"
 
 [dependencies]
 aes-gcm = "0.10.3"
-borsh = { version = "1.5.0", features = ["derive"], optional = true, default-features = false }
+borsh = { version = "1.5.0", optional = true, default-features = false }
 pest = "2.7.10"
 pest_derive = "2.7.10"
 permutation = "0.4.1"
-rabe-bn = { version = "0.4.22", optional = true, default-features = false }
+rabe-bn = { version = "0.4.23", optional = true, default-features = false }
 rand = "0.8.5"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0", optional = true, default-features = false }
 sha3 = "0.10.8"
 
 [workspace]

rabe-console/Cargo.toml

@@ -15,24 +15,24 @@ repository = "https://github.com/Fraunhofer-AISEC/rabe"
 documentation = "https://docs.rs/rabe"
 
 [features]
-default = ["serde"]
+default = ["borsh"]
 std = []
 borsh = ["borsh/std", "rabe/borsh"]
-serde = ["serde/std", "serde_cbor/std", "rabe/serde"]
+serde = ["serde/serde_derive", "serde_cbor/std", "rabe/serde"]
 
 [[bin]]
 name = "rabe"
 path = "src/mod.rs"
 
 [dependencies]
-borsh = { version = "1.5.0", features = ["derive"], optional = true, default-features = false }
+borsh = { version = "1.5.0", optional = true, default-features = false, features = ["derive"] }
 rustc-hex = "2.1.0"
 deflate = "1.0.0"
 inflate = "0.4.5"
 clap = "2.33.3"
 rand = "0.8.5"
-serde = { version = "1.0", features = ["derive"], optional = true }
+serde = { version = "1.0", optional = true, default-features = false }
 serde_cbor = { version = "0.11.2", optional = true, default-features = false }
 pest = "2.7.10"
 pest_derive = "2.7.10"
-rabe = { path = "..", optional = true, default-features = false }
+rabe = { path = "..", default-features = false, features = ["borsh"]  }

rabe-console/src/mod.rs

@@ -1623,16 +1623,18 @@ fn main() {
 #[cfg(feature = "borsh")]
 fn ser_enc<T: BorshSerialize>(input: T, head: &str, tail: &str) -> String {
     use deflate::deflate_bytes;
+    let mut buffer: Vec<u8> = Vec::new();
+    input.serialize(&mut buffer).unwrap();
     [
         head.to_string(),
         deflate_bytes(
-                &input.try_to_vec().unwrap()
+                &buffer
         ).to_hex(),
         tail.to_string()
     ].concat()
 }
 
-#[cfg(not(feature = "borsh"))]
+#[cfg(feature = "serde")]
 fn ser_enc<T: Serialize>(input: T, head: &str, tail: &str) -> String {
     use deflate::deflate_bytes;
     [
@@ -1656,7 +1658,7 @@ fn ser_dec<T: BorshDeserialize>(file_name: &String) -> Result<T, RabeError> {
     }
 }
 
-#[cfg(not(feature = "borsh"))]
+#[cfg(feature = "serde")]
 fn ser_dec<T: DeserializeOwned>(file_name: &String) -> Result<T, RabeError> {
     match ser_dec_bin(file_name) {
         Ok(parsed_bin) => match from_slice(&parsed_bin) {