diff options
| author |  guilhem <guilhem@fripost.org> | 2013-09-01 20:12:00 +0200 |
|---|---|---|
| committer |  Joey Hess <joey@kitenet.net> | 2013-09-03 14:34:16 -0400 |
| commit | eab1790ea317508309794d640940dce03ffaf65d (patch) | |
| tree | 91f98f99ac40be120d016cbdecca269044f6dd22 /Remote/S3.hs | |
| parent | b435c3b7ccab1caa36646c2ddc1f65f7fc3528e1 (diff) | |
Allow public-key encryption of file content.
With the initremote parameters "encryption=pubkey keyid=788A3F4C".
/!\ Adding or removing a key has NO effect on files that have already
been copied to the remote. Hence using keyid+= and keyid-= with such
remotes should be used with care, and make little sense unless the point
is to replace a (sub-)key by another. /!\
Also, a test case has been added to ensure that the cipher and file
contents are encrypted as specified by the chosen encryption scheme.
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 582bc2fda..ce5a1c2eb 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -129,7 +129,7 @@ storeEncrypted r (cipher, enck) k p = s3Action r False $ \(conn, bucket) -> -- To get file size of the encrypted content, have to use a temp file. -- (An alternative would be chunking to to a constant size.) withTmp enck $ \tmp -> sendAnnex k (void $ remove' r enck) $ \src -> do - liftIO $ encrypt (getGpgOpts r) cipher (feedFile src) $ + liftIO $ encrypt (getGpgEncOpts r) cipher (feedFile src) $ readBytes $ L.writeFile tmp s3Bool =<< storeHelper (conn, bucket) r enck p tmp |