diff options
| -rw-r--r-- | Remote/Helper/Encryptable.hs | 9 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index ff7d4990b..b52d2e73a 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -32,9 +32,9 @@ encryptionSetup c = case (M.lookup "encryption" c, extractCipher c) of (Just "shared", Just (EncryptedCipher _ _)) -> cannotchange (Just _, Just (SharedCipher _)) -> cannotchange (Just "shared", Nothing) -> use "encryption setup" . genSharedCipher - =<< highRandomQuality + =<< highRandomQuality (Just keyid, Nothing) -> use "encryption setup" . genEncryptedCipher keyid - =<< highRandomQuality + =<< highRandomQuality (Just keyid, Just v) -> use "encryption updated" $ updateEncryptedCipher keyid v where cannotchange = error "Cannot change encryption type of existing remote." @@ -43,8 +43,9 @@ encryptionSetup c = case (M.lookup "encryption" c, extractCipher c) of showNote $ m ++ " " ++ describeCipher cipher return $ M.delete "encryption" $ M.delete "highRandomQuality" $ storeCipher c cipher - highRandomQuality = (&&) (maybe True (/="false") (M.lookup "highRandomQuality" c)) - <$> fmap not (Annex.getState Annex.fast) + highRandomQuality = + (&&) (maybe True ( /= "false") $ M.lookup "highRandomQuality" c) + <$> fmap not (Annex.getState Annex.fast) {- Modifies a Remote to support encryption. - diff --git a/debian/changelog b/debian/changelog index e658848bd..a112c1cbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ git-annex (4.20130406) UNRELEASED; urgency=low + * initremote: Generates encryption keys with high quality entropy. + This can be disabled using --fast to get the old behavior. + The assistant still uses low-quality entropy when creating encrypted + remotes, to avoid delays. + Thanks, guilhem for the patch. * Bugfix: Direct mode no longer repeatedly checksums duplicated files. -- Joey Hess <joeyh@debian.org> Sat, 06 Apr 2013 15:24:15 -0400 |