aboutsummaryrefslogtreecommitdiff
path: root/doc/encryption.mdwn
diff options
context:
space:
mode:
authorGravatar guilhem <guilhem@fripost.org>2013-03-29 17:06:02 +0100
committerGravatar Joey Hess <joey@kitenet.net>2013-03-29 18:04:52 -0400
commit71760a359f5515053085f242258dc615a1db1fd8 (patch)
tree0e49337fb773b721173aa25fc36635e05d8918f8 /doc/encryption.mdwn
parentf3ee9b50b3a9caff7ec65ddaa9197f6daaf6f745 (diff)
Allow other MAC algorithms in the Remote Config.
Diffstat (limited to 'doc/encryption.mdwn')
-rw-r--r--doc/encryption.mdwn7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/encryption.mdwn b/doc/encryption.mdwn
index cc61fea6f..5349e8c7a 100644
--- a/doc/encryption.mdwn
+++ b/doc/encryption.mdwn
@@ -21,6 +21,13 @@ If you want to use encryption, run `git annex initremote` with
Typically, you will say "encryption=2512E3C7" to use a specific gpg key.
Or, you might say "encryption=joey@kitenet.net" to search for matching keys.
+The default MAC algorithm to be applied on the filenames is HMACSHA1. A
+stronger one, for instance HMACSHA512, one can be chosen upon creation
+of the special remote with the option `mac=HMACSHA512`. The available
+MAC algorithms are HMACSHA1, HMACSHA224, HMACSHA256, HMACSHA384, and
+HMACSHA512. Note that it is not possible to change algorithm for a
+non-empty remote.
+
The [[encryption_design|design/encryption]] allows additional encryption keys
to be added on to a special remote later. Once a key is added, it is able
to access content that has already been stored in the special remote.