Issue 277 reed-solomon

Cargo.toml

@@ -58,6 +58,7 @@ subtle = "2.6.1"
 bon = "3.3.0"
 shush-rs = "0.1.10"
 criterion = { version = "0.5.1", features = ["html_reports"] }
+reed-solomon-erasure = "5"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 fuse3 = { version = "0.8.1", features = ["tokio-runtime", "unprivileged"] }

examples/encryptedfs.rs

@@ -31,6 +31,7 @@ async fn main() -> Result<()> {
         data_dir.clone(),
         Box::new(PasswordProviderImpl {}),
         cipher,
+        None,
         false,
     )
     .await?;

examples/file_handling.rs

@@ -35,6 +35,7 @@ async fn main() -> Result<()> {
         data_dir.clone(),
         Box::new(PasswordProviderImpl),
         cipher,
+        None,
         false,
     )
     .await?;

examples/rs_example.rs

@@ -0,0 +1,23 @@
+use rencfs::crypto::rs::RsEncoder;
+
+fn main() {
+    let encoder = RsEncoder::new(3, 2);
+    let data = b"hello, this is my message";
+
+    println!("Original: {}", String::from_utf8_lossy(data));
+
+    let shards = encoder.encode(data).expect("encode failed");
+    println!("Created {} shards", shards.len());
+
+    let mut shards_opt: Vec<Option<Vec<u8>>> = shards.into_iter().map(Some).collect();
+    shards_opt[0] = None; // drop one data shard
+    shards_opt[4] = None; // drop one parity shard
+
+    println!("Simulated missing shards at indexes 0 and 4");
+
+    let recovered = encoder
+        .reconstruct(&mut shards_opt)
+        .expect("reconstruct failed");
+
+    println!("Recovered: {}", String::from_utf8_lossy(&recovered));
+}

src/crypto.rs

@@ -19,7 +19,7 @@ use serde::{Deserialize, Serialize};
 use shush_rs::{ExposeSecret, SecretString, SecretVec};
 use strum_macros::{Display, EnumIter, EnumString};
 use thiserror::Error;
-use tracing::{debug, error, instrument};
+use tracing::{debug, instrument};
 use write::CryptoInnerWriter;
 
 use crate::crypto::read::{CryptoRead, CryptoReadSeek, RingCryptoRead};
@@ -29,6 +29,7 @@ use crate::{fs_util, stream_util};
 
 pub mod buf_mut;
 pub mod read;
+pub mod rs;
 pub mod write;
 
 pub static BASE64: GeneralPurpose = GeneralPurpose::new(&STANDARD, NO_PAD);

src/crypto/read.rs

@@ -71,8 +71,6 @@ macro_rules! decrypt_block {
     }};
 }
 
-pub(crate) use decrypt_block;
-
 #[allow(clippy::module_name_repetitions)]
 pub struct RingCryptoRead<R: Read> {
     input: Option<R>,
@@ -201,7 +199,7 @@ impl<R: Read + Seek> Seek for RingCryptoRead<R> {
         let block_index = self.pos() / self.plaintext_block_size as u64;
         let new_block_index = new_pos / self.plaintext_block_size as u64;
         if block_index == new_block_index {
-            let at_full_block_end = self.pos() % self.plaintext_block_size as u64 == 0
+            let at_full_block_end = self.pos().is_multiple_of(self.plaintext_block_size as u64)
                 && self.buf.available_read() == 0;
             if self.buf.available() > 0
                 // this make sure we are not at the end of the current block, which is the start boundary of next block
@@ -224,7 +222,7 @@ impl<R: Read + Seek> Seek for RingCryptoRead<R> {
             ))?;
             self.buf.clear();
             self.block_index = new_block_index;
-            if new_pos % self.plaintext_block_size as u64 == 0 {
+            if new_pos.is_multiple_of(self.plaintext_block_size as u64) {
                 // in case we need to seek at the start of the new block, we need to decrypt here, because we altered
                 // the block_index but the seek seek_forward from below will not decrypt anything
                 // as the offset in new block is 0. In that case the po()