Commit graph

3274 commits

Author SHA1 Message Date
dachshund
b681c54ee4 Merge branch 'develop' into path_hash_prefix 2013-09-05 17:53:01 -04:00
dachshund
ab4558f7e0 Merge branch 'develop' into path_hash_prefix 2013-09-05 17:53:01 -04:00
dachshund
c4557c2a0c WIP on refactoring the updater and downloader. 2013-09-05 15:44:29 -04:00
dachshund
168bd00130 WIP on refactoring the updater and downloader. 2013-09-05 15:44:29 -04:00
vladdd
85771dc7e3 Continue updating unit tests affected by PyCrypto changes 2013-09-05 11:50:15 -04:00
vladdd
1eb806460c Continue updating unit tests affected by PyCrypto changes 2013-09-05 11:50:15 -04:00
dachshund
36a11f7f0a Adapt the updater unit test against latest changes. 2013-09-05 00:23:23 -04:00
dachshund
9acc102977 Adapt the updater unit test against latest changes. 2013-09-05 00:23:23 -04:00
dachshund
74e5764a53 Merge with updater/download refactoring from @zanefisher.
Update download unit test to work after refactoring, but it is a little
incomplete (in particular, the unsafe_download function needs more testing).
2013-09-04 23:45:08 -04:00
dachshund
2d58aeee43 Merge with updater/download refactoring from @zanefisher.
Update download unit test to work after refactoring, but it is a little
incomplete (in particular, the unsafe_download function needs more testing).
2013-09-04 23:45:08 -04:00
dachshund
e7c2426f3c Merge branch 'refactor-download-update' of https://github.com/zanefisher/tuf into refactor-download-update 2013-09-04 22:58:17 -04:00
dachshund
ab42c5e074 Merge branch 'refactor-download-update' of https://github.com/zanefisher/tuf into refactor-download-update 2013-09-04 22:58:17 -04:00
dachshund
bc2af95baa Merge https://github.com/zanefisher/tuf into refactor-download-update 2013-09-04 22:53:32 -04:00
dachshund
6475a36e21 Merge https://github.com/zanefisher/tuf into refactor-download-update 2013-09-04 22:53:32 -04:00
zanefisher
5970ad8c25 Refactor client.updater, removing verification from download.py. 2013-09-04 20:12:51 -04:00
zanefisher
3db934e81a Refactor client.updater, removing verification from download.py. 2013-09-04 20:12:51 -04:00
dachshund
3bbe4672d7 Replace generic exception with a specific one. 2013-09-04 17:29:06 -04:00
dachshund
da5b9e0999 Replace generic exception with a specific one. 2013-09-04 17:29:06 -04:00
dachshund
d5272cfc7c Add some exceptions for more fine-grained exception handling. 2013-09-04 16:48:38 -04:00
dachshund
16d971da0e Add some exceptions for more fine-grained exception handling. 2013-09-04 16:48:38 -04:00
dachshund
70097a71cb Revert "Check out my cool code."
This reverts commit 7497502087.
2013-09-03 18:11:48 -04:00
dachshund
9ff22ddd4e Revert "Check out my cool code."
This reverts commit 7497502087.
2013-09-03 18:11:48 -04:00
dachshund
89e0b76ff6 Check out my cool code. 2013-09-03 18:11:00 -04:00
dachshund
7497502087 Check out my cool code. 2013-09-03 18:11:00 -04:00
dachshund
f1b2b26dc1 Merge branch 'develop' into refactor-download-update
Conflicts:
	tuf/tests/aggregate_tests.py
	tuf/tests/test_signercli.py
	tuf/tests/test_signerlib.py
	tuf/tests/test_updater.py
2013-09-03 13:06:32 -04:00
dachshund
d6d8257349 Merge branch 'develop' into refactor-download-update
Conflicts:
	tuf/tests/aggregate_tests.py
	tuf/tests/test_signercli.py
	tuf/tests/test_signerlib.py
	tuf/tests/test_updater.py
2013-09-03 13:06:32 -04:00
dachshund
9734b68d15 Merge #99. 2013-09-03 12:52:47 -04:00
dachshund
63fa51ac20 Merge #99. 2013-09-03 12:52:47 -04:00
vladdd
79c3856916 Add tests for create_encrypted_pem() and create_from_encrypted_pem() 2013-09-03 12:48:26 -04:00
vladdd
7c7349a9c8 Add tests for create_encrypted_pem() and create_from_encrypted_pem() 2013-09-03 12:48:26 -04:00
vladdd
8e5c8ac5e0 Merge branch 'develop' into pycrypto 2013-09-03 12:19:59 -04:00
vladdd
f613f85e31 Merge branch 'develop' into pycrypto 2013-09-03 12:19:59 -04:00
vladdd
a11d26091f Merge branch 'zanefisher-fix_tests' into develop 2013-08-30 14:59:45 -04:00
vladdd
471aedb5a1 Merge branch 'zanefisher-fix_tests' into develop 2013-08-30 14:59:45 -04:00
vladdd
1b367116da Review Zane's unit test fixes and resolve merge conflicts 2013-08-30 14:58:41 -04:00
vladdd
19fae3c908 Review Zane's unit test fixes and resolve merge conflicts 2013-08-30 14:58:41 -04:00
vladdd
c99a8d1a0c Review Zane's unit test fixes and resolve merge conflicts 2013-08-30 14:56:33 -04:00
vladdd
55c343394a Review Zane's unit test fixes and resolve merge conflicts 2013-08-30 14:56:33 -04:00
vladdd
0e2f59eb4b Update rsa_key.py and keystore.py with final PyCrypto major changes
rsa_key.py was modified to generate and verify RSASSA-PSS signatures instead of RSASSA-PKCS1-v1_5.  Optional functions to read and save passphrase-protected PEM files also added to rsa_key.py.  keystore.py was modified to generate encrypted .key files (similar scheme as before) with PyCrypto to support uniform encryption of varied key types.  User passwords are no longer temporarily stored, but used to derive a symmetric key with PBKDF2.  The derived key is then used with AES-256-Mode-CTR to generate the encrypted key data.  Affected unit tests updated.
2013-08-29 09:28:03 -04:00
vladdd
fe27f24eac Update rsa_key.py and keystore.py with final PyCrypto major changes
rsa_key.py was modified to generate and verify RSASSA-PSS signatures instead of RSASSA-PKCS1-v1_5.  Optional functions to read and save passphrase-protected PEM files also added to rsa_key.py.  keystore.py was modified to generate encrypted .key files (similar scheme as before) with PyCrypto to support uniform encryption of varied key types.  User passwords are no longer temporarily stored, but used to derive a symmetric key with PBKDF2.  The derived key is then used with AES-256-Mode-CTR to generate the encrypted key data.  Affected unit tests updated.
2013-08-29 09:28:03 -04:00
dachshund
5795348d51 Merge #96. 2013-08-28 16:40:13 -04:00
dachshund
13123f39aa Merge #96. 2013-08-28 16:40:13 -04:00
dachshund
0eb31e05a8 Merge branch 'develop' into refactor-download-update
Conflicts:
	tuf/client/updater.py
	tuf/tests/test_download.py
	tuf/tests/test_updater.py
2013-08-28 13:44:21 -04:00
dachshund
4b555f6c1d Merge branch 'develop' into refactor-download-update
Conflicts:
	tuf/client/updater.py
	tuf/tests/test_download.py
	tuf/tests/test_updater.py
2013-08-28 13:44:21 -04:00
zhengyuyu
dcae72c19d delete signal import 2013-08-28 05:53:00 -04:00
zhengyuyu
6638089b99 Fix the slow retrieval attack issue
download.py:Add a timeout and rewrite the _fileobject.read()

test_slow_retrieval_attack.py:Add a new kind of slow retrieval attack

slow_retrieval_server.py:Modification for new kind of slow retrieval attack
2013-08-28 05:43:47 -04:00
ttgump
74c1d29a37 Update fix for endless-data-attack test. 2013-08-27 17:02:42 -04:00
ttgump
2048a3eccb Update fix for endless-data-attack test. 2013-08-27 17:02:42 -04:00
ttgump
a50f759370 Merge remote-tracking branch 'upstream/develop'
Conflicts:
	tuf/tests/system_tests/test_endless_data_attack.py
2013-08-27 15:59:32 -04:00
ttgump
978b83cb57 Merge remote-tracking branch 'upstream/develop'
Conflicts:
	tuf/tests/system_tests/test_endless_data_attack.py
2013-08-27 15:59:32 -04:00