summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-24 02:14:36 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-24 02:14:36 -0400
commit845cce262c5f593e00e5cc5ebd7619595d848f36 (patch)
treee7bdb251d9b63185caaa6f3389807dfc1e6e8f7b /doc
parenteef17cf4bd229f4b692b5eda320f8d3d76d2c2dd (diff)
update
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/sha1_collision_embedding_in_git-annex_keys.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/todo/sha1_collision_embedding_in_git-annex_keys.mdwn b/doc/todo/sha1_collision_embedding_in_git-annex_keys.mdwn
index 1a73a279d..16bcdbc7d 100644
--- a/doc/todo/sha1_collision_embedding_in_git-annex_keys.mdwn
+++ b/doc/todo/sha1_collision_embedding_in_git-annex_keys.mdwn
@@ -27,15 +27,15 @@ A few other potential problems:
Impact is limited, because even if an attacker does this, the key also
contains the checksum (eg SHA2) of the annexed data. The current SHA1
- attack is only a prefix attack; it does not allow creating two colliding
- keys that contain two different SHA2 checksums. That would need a
- preimage attack to be feasible.
+ attack is only a common-prefix attack; it does not allow creating two
+ colliding keys that contain two different SHA2 checksums. That would need a
+ chosen-prefix attack to be feasible.
It might be worth limiting the length
of an extension allowed in such a key to the longest such extension
git-annex has ever supported (probably < 20 bytes or so), which would
be less than the size of the data needed for current SHA1 collision
- attacks. Presumably aa preimage attack would need a similar amount of
+ attacks. Presumably aa chosen-prefix attack would need a similar amount of
data.
* It might be possible to embed colliding data in a specially constructed