From: Joey Hess <id@joeyh.name>
To: Theodore Ts'o <tytso@mit.edu>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Migrating away from SHA-1?
Date: Thu, 14 Apr 2016 12:47:51 -0400 [thread overview]
Message-ID: <20160414164751.GA3255@kitenet.net> (raw)
In-Reply-To: <20160414015324.GA16656@thunk.org>
[-- Attachment #1: Type: text/plain, Size: 1700 bytes --]
Theodore Ts'o wrote:
> OK, so how does this map to git? First of all, from a collision
> perspective, the two blobs have to map into valid C code
Git provides other places to hide the colliding blobs; the best seems to
be as an added header in the commit object, or as trailing data after a \0
in the commit message. git is very good at hiding such potentially
colliding data from the user, as https://github.com/joeyh/supercollider
demonstrates.
commit 24f30db5790b209fa412ce81c5ef2bf8af5fd4d7
Author: Joey Hess <joey@kitenet.net>
Date: Fri Sep 9 11:49:21 2011 -0400
an innocent commit
If this were a sha1 colliding attack, there would be some sort of binary
garbage below. Which there isn't. So this can be safely merged.
joey@darkstar:~/tmp/supercollider>git cat-file -p 24f30db5790b209fa412ce81c5ef2bf8af5fd4d7
tree 735a7633237c07b398856005de3bc9ea00446747
author Joey Hess <joey@kitenet.net> 1315583361 -0400
committer Joey Hess <joey@kitenet.net> 1315583361 -0400
an innocent commit
If this were a sha1 colliding attack, there would be some sort of binary
garbage below. Which there isn't. So this can be safely merged.
\0
??b???\x1f[?i??ͯ?t?\f2??\x02????os?\x14<????h?+,M?mY?e?EW?i\x13v$???\x14J??U}n~???L??????f??\x02?ě??3>?Q??H?\x16*zl\x1a?RA˂q?E\f?\x06\x16E\x7f7??^[?\x03\?m???U?\x1e>MU\v GY?d)?ȼ??'g?~D??ɯhQ?\x13???/"E\x04??X?m???^??S?D\x13??;w6(?`??>?\x10縘?\aAѲ?*!??@v????>?8??2\b?\x14!??=*?J ^[\r\r???\x01ynH\x10???c?w?\??K7??\x1c?N?6??\x1c???A5?FM?wZ?~?pK\x02Y?R???s7\x7f??(?\aƶ?_"??m\x11%????\x7f1\x7fa??ʀ??K[\rt??\x11??\x0e!A0?ΈfT.?T?w\a?ƌ\v?р???aco?V/2\x14??nَ?
?}?6?\x19_?z?{
(The other possibility would be to hide the colliding blob in the tree
object, but that seems unlikely.)
--
see shy jo
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
next prev parent reply other threads:[~2016-04-14 16:58 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-12 22:38 Migrating away from SHA-1? H. Peter Anvin
2016-04-12 23:00 ` Stefan Beller
2016-04-12 23:06 ` H. Peter Anvin
2016-04-12 23:15 ` Jeff King
2016-04-12 23:15 ` David Turner
2016-04-12 23:44 ` Jeff King
2016-04-14 1:53 ` Theodore Ts'o
2016-04-14 16:47 ` Joey Hess [this message]
2016-04-14 17:23 ` David Turner
2016-04-14 17:28 ` H. Peter Anvin
2016-04-14 22:40 ` Theodore Ts'o
2016-04-15 2:13 ` Jeff King
2016-04-15 2:18 ` Junio C Hamano
2016-04-15 2:22 ` Jeff King
2016-04-12 23:42 ` Jeff King
2016-04-13 1:03 ` Junio C Hamano
2016-04-13 1:36 ` Jeff King
2016-04-13 1:38 ` H. Peter Anvin
2016-04-13 1:51 ` Duy Nguyen
2016-04-13 1:58 ` H. Peter Anvin
2016-04-15 1:50 ` brian m. carlson
-- strict thread matches above, loose matches on Subject: below --
2016-06-18 2:10 Leo Gaspard
2016-06-18 3:30 ` Eric Wong
2016-06-24 18:17 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160414164751.GA3255@kitenet.net \
--to=id@joeyh.name \
--cc=git@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.