5 files changed, 68 insertions, 9 deletions

diff --git a/src/cmd/backup.rs b/src/cmd/backup.rs
index 0479844..22afd6e 100644
--- a/src/cmd/backup.rs
+++ b/src/cmd/backup.rs
@@ -60,7 +60,6 @@ fn initial_backup(
     info!("fresh backup without a previous generation");
     let newtemp = NamedTempFile::new()?;
     let run = InitialBackup::new(config, &client)?;
-    let config = config.config();
     let mut all_warnings = vec![];
     let count = {
         let mut new = NascentGeneration::create(newtemp.path())?;
@@ -87,7 +86,6 @@ fn incremental_backup(
     info!("incremental backup based on {}", old_ref);
     let newtemp = NamedTempFile::new()?;
     let mut run = IncrementalBackup::new(config, &client)?;
-    let config = config.config();
     let mut all_warnings = vec![];
     let count = {
         let oldtemp = NamedTempFile::new()?;
diff --git a/src/cmd/chunk.rs b/src/cmd/chunk.rs
new file mode 100644
index 0000000..e0e91b1
--- /dev/null
+++ b/src/cmd/chunk.rs
@@ -0,0 +1,64 @@
+use crate::chunk::DataChunk;
+use crate::chunkmeta::ChunkMeta;
+use crate::cipher::CipherEngine;
+use crate::config::ClientConfig;
+use crate::error::ObnamError;
+use std::path::PathBuf;
+use structopt::StructOpt;
+
+#[derive(Debug, StructOpt)]
+pub struct EncryptChunk {
+    #[structopt(parse(from_os_str))]
+    filename: PathBuf,
+
+    #[structopt(parse(from_os_str))]
+    output: PathBuf,
+
+    #[structopt()]
+    json: String,
+}
+
+impl EncryptChunk {
+    pub fn run(&self, config: &ClientConfig) -> Result<(), ObnamError> {
+        let pass = config.passwords()?;
+        let cipher = CipherEngine::new(&pass);
+
+        let meta = ChunkMeta::from_json(&self.json)?;
+
+        let cleartext = std::fs::read(&self.filename)?;
+        let chunk = DataChunk::new(cleartext, meta);
+        let encrypted = cipher.encrypt_chunk(&chunk)?;
+
+        std::fs::write(&self.output, encrypted.ciphertext())?;
+
+        Ok(())
+    }
+}
+
+#[derive(Debug, StructOpt)]
+pub struct DecryptChunk {
+    #[structopt(parse(from_os_str))]
+    filename: PathBuf,
+
+    #[structopt(parse(from_os_str))]
+    output: PathBuf,
+
+    #[structopt()]
+    json: String,
+}
+
+impl DecryptChunk {
+    pub fn run(&self, config: &ClientConfig) -> Result<(), ObnamError> {
+        let pass = config.passwords()?;
+        let cipher = CipherEngine::new(&pass);
+
+        let meta = ChunkMeta::from_json(&self.json)?;
+
+        let encrypted = std::fs::read(&self.filename)?;
+        let chunk = cipher.decrypt_chunk(&encrypted, &meta.to_json_vec())?;
+
+        std::fs::write(&self.output, chunk.data())?;
+
+        Ok(())
+    }
+}
diff --git a/src/cmd/init.rs b/src/cmd/init.rs
index cb61fba..08060f7 100644
--- a/src/cmd/init.rs
+++ b/src/cmd/init.rs
@@ -1,4 +1,4 @@
-use crate::config::ClientConfigWithoutPasswords;
+use crate::config::ClientConfig;
 use crate::error::ObnamError;
 use crate::passwords::{passwords_filename, Passwords};
 use structopt::StructOpt;
@@ -12,11 +12,7 @@ pub struct Init {
 }
 
 impl Init {
-    pub fn run(&self, config: &ClientConfigWithoutPasswords) -> Result<(), ObnamError> {
-        if !config.encrypt {
-            panic!("no encryption specified");
-        }
-
+    pub fn run(&self, config: &ClientConfig) -> Result<(), ObnamError> {
         let passphrase = match &self.insecure_passphrase {
             Some(x) => x.to_string(),
             None => rpassword::read_password_from_tty(Some(PROMPT)).unwrap(),
diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs
index 890e176..bd101da 100644
--- a/src/cmd/mod.rs
+++ b/src/cmd/mod.rs
@@ -1,4 +1,5 @@
 pub mod backup;
+pub mod chunk;
 pub mod get_chunk;
 pub mod init;
 pub mod list;
diff --git a/src/cmd/show_config.rs b/src/cmd/show_config.rs
index 424e2ed..05e83c1 100644
--- a/src/cmd/show_config.rs
+++ b/src/cmd/show_config.rs
@@ -7,7 +7,7 @@ pub struct ShowConfig {}
 
 impl ShowConfig {
     pub fn run(&self, config: &ClientConfig) -> Result<(), ObnamError> {
-        println!("{}", serde_json::to_string_pretty(&config.config())?);
+        println!("{}", serde_json::to_string_pretty(config)?);
         Ok(())
     }
 }