diff options
| author |  guilhem <guilhem@fripost.org> | 2013-03-11 02:33:13 +0100 |
|---|---|---|
| committer |  Joey Hess <joey@kitenet.net> | 2013-03-11 09:48:38 -0400 |
| commit | 7fa1e498de9cbb84b23f90b17c66d755292ae716 (patch) | |
| tree | dc1f5127473d3450b138b4aedfe43a5248d42939 /Remote/Directory.hs | |
| parent | f2292dc3b494dbed517a48ab2876594f5ace0179 (diff) | |
GnuPG options for symmetric encryption.
Diffstat (limited to 'Remote/Directory.hs')
| -rw-r--r-- | Remote/Directory.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 3070a530b..141586938 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -38,7 +38,7 @@ gen r u c gc = do cst <- remoteCost gc cheapRemoteCost let chunksize = chunkSize c return $ encryptableRemote c - (storeEncrypted dir chunksize) + (storeEncrypted dir (getGpgOpts gc) chunksize) (retrieveEncrypted dir chunksize) Remote { uuid = u, @@ -124,11 +124,11 @@ store d chunksize k _f p = sendAnnex k (void $ remove d k) $ \src -> storeSplit meterupdate chunksize dests =<< L.readFile src -storeEncrypted :: FilePath -> ChunkSize -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool -storeEncrypted d chunksize (cipher, enck) k p = sendAnnex k (void $ remove d enck) $ \src -> +storeEncrypted :: FilePath -> GpgOpts -> ChunkSize -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool +storeEncrypted d gpgOpts chunksize (cipher, enck) k p = sendAnnex k (void $ remove d enck) $ \src -> metered (Just p) k $ \meterupdate -> storeHelper d chunksize enck $ \dests -> - encrypt cipher (feedFile src) $ readBytes $ \b -> + encrypt gpgOpts cipher (feedFile src) $ readBytes $ \b -> case chunksize of Nothing -> do let dest = Prelude.head dests |