stable

Clone or download

Read-only

Merge commit 'refs/changes/77/7777/6' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: request #10015: Mitigate SHA-1 collision in SVN Change-Id: I0dcedb6f4ae3b0abb97b5610d51deb7391b717d7

Modified Files

Name
M plugins/svn/bin/svn_pre_commit.php +8 −3 Go to diff View file
M plugins/svn/include/Svn/Commit/Svnlook.class.php +13 −1 Go to diff View file
M plugins/svn/include/Svn/Hooks/PreCommit.php +57 −11 Go to diff View file
A plugins/svn/tests/Svn/Hooks/PreCommitSHA1CollisionTest.php +74 −0 Go to diff View file
M plugins/svn/tests/Svn/Hooks/PreCommitTest.php +5 −1 Go to diff View file
M src/common/autoload.php +4 −2 Go to diff View file
A src/common/svn/SHA1CollisionDetector.php +40 −0 Go to diff View file
A src/common/svn/SHA1CollisionException.php +25 −0 Go to diff View file
M src/common/svn/SVN_Svnlook.class.php +13 −3 Go to diff View file
M src/common/svn/hook/PreCommit.class.php +47 −4 Go to diff View file
M src/utils/svn/codendi_svn_pre_commit.php +5 −1 Go to diff View file
A tests/simpletest/common/svn/PreCommitSHA1CollisionTest.php +68 −0 Go to diff View file
M tests/simpletest/common/svn/PreCommitTest.php +3 −1 Go to diff View file
A tests/simpletest/common/svn/SHA1CollisionDetectorTest.php +46 −0 Go to diff View file
A tests/simpletest/common/svn/_fixtures/tuleap-shattered.pdf Binary file Go to diff View file