aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-04 18:00:02 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-04 18:00:02 -0400
commitf77547a335232d85af462764ce90531815b1fea3 (patch)
treece63a0ee118d11920024477f5f0cfc5ffd4f0996
parenteab1790ea317508309794d640940dce03ffaf65d (diff)
fix build (seems getGpgEncOpts got renamed to getGpgEncParams)
-rw-r--r--Crypto.hs2
-rw-r--r--Remote/S3.hs2
-rw-r--r--Remote/WebDAV.hs2
3 files changed, 3 insertions, 3 deletions
diff --git a/Crypto.hs b/Crypto.hs
index 2a2dd3cf2..ed558d8c3 100644
--- a/Crypto.hs
+++ b/Crypto.hs
@@ -155,7 +155,7 @@ readBytes a h = L.hGetContents h >>= a
- public-key encryption is used) using the given gpg options, and then
- read by the Reader action. Note: For public-key encryption,
- recipients MUST be included in 'params' (for instance using
- - 'getGpgEncOpts'). -}
+ - 'getGpgEncParams'). -}
encrypt :: [CommandParam] -> Cipher -> Feeder -> Reader a -> IO a
encrypt params cipher = Gpg.feedRead params' pass
where
diff --git a/Remote/S3.hs b/Remote/S3.hs
index ce5a1c2eb..814dd3a23 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 (getGpgEncOpts r) cipher (feedFile src) $
+ liftIO $ encrypt (getGpgEncParams r) cipher (feedFile src) $
readBytes $ L.writeFile tmp
s3Bool =<< storeHelper (conn, bucket) r enck p tmp
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index 4c3bb5c49..c444a7f2b 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -94,7 +94,7 @@ storeEncrypted :: Remote -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool
storeEncrypted r (cipher, enck) k p = metered (Just p) k $ \meterupdate ->
davAction r False $ \(baseurl, user, pass) ->
sendAnnex k (void $ remove r enck) $ \src ->
- liftIO $ encrypt (getGpgEncOpts r) cipher
+ liftIO $ encrypt (getGpgEncParams r) cipher
(streamMeteredFile src meterupdate) $
readBytes $ storeHelper r enck baseurl user pass