summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-05 14:23:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-05 14:23:55 -0400
commit349da7cd84ab7b5d4b602bc3ab51e3a548a1633a (patch)
treee3f2c45d7c9008ac7dc04cd86563f8c507c5be7c
parent760cddf6f3ecca2f59450f260f0f7eb5c6b6b52a (diff)
parent2d637c3ff3edaeaf673fa9d4c6c3a1da7da1b643 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/encryption_key_is_surprising/comment_4_8ec86b8c35bce15337a143e275961cd5._comment8
-rw-r--r--doc/forum/syncing_home_directories.mdwn7
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/bugs/encryption_key_is_surprising/comment_4_8ec86b8c35bce15337a143e275961cd5._comment b/doc/bugs/encryption_key_is_surprising/comment_4_8ec86b8c35bce15337a143e275961cd5._comment
new file mode 100644
index 000000000..ba5be68d4
--- /dev/null
+++ b/doc/bugs/encryption_key_is_surprising/comment_4_8ec86b8c35bce15337a143e275961cd5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://phil.0x539.de/"
+ nickname="Philipp Kern"
+ subject="comment 4"
+ date="2013-03-05T07:17:08Z"
+ content="""
+You (presumably) hand over 320 bytes of entropy to GPG, but you don't control the encryption key directly. GPG assumes that what it's given as a symmetric key is not at all random. Hence, with the default options (for OpenPGP interop, apparently) it will derive a 128 bit from the given passphrase. For this it uses (again, by default) salted SHA1 on the whole passphrase. So the strength of the cipher is 128 bit CAST5 or an attack on salted SHA1 with a mostly known input length (but this does seem large).
+"""]]
diff --git a/doc/forum/syncing_home_directories.mdwn b/doc/forum/syncing_home_directories.mdwn
new file mode 100644
index 000000000..fcd391732
--- /dev/null
+++ b/doc/forum/syncing_home_directories.mdwn
@@ -0,0 +1,7 @@
+Hi,
+
+I synchronize home directories on a couple of machines using unison. Is there a recommended way to do the equivalent using git-annex?
+
+Thanks,
+
+John