oupson
/
rustcryptfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add load_from_reader to GocryptFs

This commit is contained in:
oupson 2022-10-07 20:52:16 +02:00
parent 733237ba40
commit 2dabc7c0c0
Signed by: oupson
GPG Key ID: 3BD88615552EFCB7
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rustcryptfs-lib/src/lib.rs
View File

@ -1,6 +1,6 @@
//! A library to write gocryptfs compatible programs. //! A library to write gocryptfs compatible programs.
use std::{fs::File, path::Path}; use std::{fs::File, io::Read, path::Path};
use content_enc::ContentEnc; use content_enc::ContentEnc;
use filename::FilenameCipher; use filename::FilenameCipher;
@ -26,17 +26,25 @@ impl GocryptFs {
{ {
let base_path = encrypted_dir_path.as_ref(); let base_path = encrypted_dir_path.as_ref();
let config = { let mut config_file =
let mut config_file = File::open(base_path.join("gocryptfs.conf")).expect("failed to get config");
File::open(base_path.join("gocryptfs.conf")).expect("failed to get config");
serde_json::from_reader::<_, config::CryptConf>(&mut config_file) Self::load_from_reader(&mut config_file, password.as_bytes())
.expect("failed to parse config") }
};
let master_key = config.get_master_key(password.as_bytes())?; /// Load a gocryptfs from the config.
///
/// reader_config must be a reader of a valid `gocryptfs.conf`.
pub fn load_from_reader<R>(reader_config: &mut R, password: &[u8]) -> error::Result<Self>
where
R: Read,
{
let config = serde_json::from_reader::<_, config::CryptConf>(reader_config)
.expect("failed to parse config");
let filename_decoder = FilenameDecoder::new(&master_key)?; let master_key = config.get_master_key(password)?;
let filename_decoder = FilenameCipher::new(&master_key)?;
let content_decoder = ContentEnc::new(&master_key, 16); // TODO IV LEN let content_decoder = ContentEnc::new(&master_key, 16); // TODO IV LEN
Ok(Self { Ok(Self {