Commit graph

3274 commits

Author SHA1 Message Date
dachshund
9f1d82aecd Merge branch 'demo2' into develop 2013-09-17 23:38:06 -04:00
dachshund
a0f437b2e4 Better string representation of NoWorkingMirrorError. 2013-09-17 23:36:48 -04:00
dachshund
f9a1ac9a4c Better string representation of NoWorkingMirrorError. 2013-09-17 23:36:48 -04:00
dachshund
b0e328be53 Fix replay attack integration test.
Merge remote-tracking branch 'origin/demo2' into demo2

Conflicts:
	tests/integration/test_replay_attack.py
2013-09-17 23:02:17 -04:00
dachshund
d9e952ef5b Fix replay attack integration test.
Merge remote-tracking branch 'origin/demo2' into demo2

Conflicts:
	tests/integration/test_replay_attack.py
2013-09-17 23:02:17 -04:00
dachshund
4e42a091a2 Fix replay attack integration test. 2013-09-17 22:59:26 -04:00
dachshund
7eb834ab84 Fix replay attack integration test. 2013-09-17 22:59:26 -04:00
vladdd
b17b53112c Resolve merge conflicts 2013-09-17 21:10:51 -04:00
vladdd
c2689280b0 Resolve merge conflicts 2013-09-17 21:10:51 -04:00
vladdd
81831b861e Merge branch 'demo2' of https://github.com/theupdateframework/tuf into demo2 2013-09-17 20:23:11 -04:00
vladdd
ac2e7b5e15 Merge branch 'demo2' of https://github.com/theupdateframework/tuf into demo2 2013-09-17 20:23:11 -04:00
vladdd
98ae4a6d68 Fix docstring indentation in test_arbitrary_package_attack.py 2013-09-17 20:20:55 -04:00
vladdd
071190d18b Fix docstring indentation in test_arbitrary_package_attack.py 2013-09-17 20:20:55 -04:00
vladdd
6964c331fc Merge branch 'demo2' of https://github.com/zanefisher/tuf into zanefisher-demo2 2013-09-17 20:04:03 -04:00
vladdd
5282d459f3 Merge branch 'demo2' of https://github.com/zanefisher/tuf into zanefisher-demo2 2013-09-17 20:04:03 -04:00
dachshund
91aff1c420 Merge #108. 2013-09-17 20:02:54 -04:00
dachshund
76326f82d1 Merge #108. 2013-09-17 20:02:54 -04:00
dachshund
61be096ad9 Merge branch 'demo2' of https://github.com/zhengyuyu/tuf into zhengyuyu-demo2 2013-09-17 19:38:26 -04:00
dachshund
e210decd61 Merge branch 'demo2' of https://github.com/zhengyuyu/tuf into zhengyuyu-demo2 2013-09-17 19:38:26 -04:00
vladdd
06fcf73839 Update key size comments for rsa_key.py & signerlib.py - issue #112 2013-09-17 10:11:23 -04:00
vladdd
22f8c03d63 Update key size comments for rsa_key.py & signerlib.py - issue #112 2013-09-17 10:11:23 -04:00
ttgump
0f71b7604d fix of connection refused 2013-09-16 11:12:18 -04:00
ttgump
017c9a378f fix of connection refused 2013-09-16 11:12:18 -04:00
ttgump
21c74ae995 Merge remote-tracking branch 'upstream/demo2' into demo2 2013-09-16 10:59:56 -04:00
ttgump
3bdc17adad Merge remote-tracking branch 'upstream/demo2' into demo2 2013-09-16 10:59:56 -04:00
ttgump
c393507fcd fetch upstream 2013-09-16 10:57:23 -04:00
ttgump
2baaa58a20 fetch upstream 2013-09-16 10:57:23 -04:00
vladimir-v-diaz
cc0d7f9e89 Update test_util_test_tools.py following change to util_test_tools.init_repo()
A util_test_tools.init_repo() parameter name was changed from 'tuf' to 'using_tuf', however, test_util_test_tools was not updated following the name change.
2013-09-16 09:09:40 -04:00
vladimir-v-diaz
b9ec0a0b26 Update test_util_test_tools.py following change to util_test_tools.init_repo()
A util_test_tools.init_repo() parameter name was changed from 'tuf' to 'using_tuf', however, test_util_test_tools was not updated following the name change.
2013-09-16 09:09:40 -04:00
vladimir-v-diaz
42479b1d60 Merge branch 'demo2' of https://github.com/theupdateframework/tuf into demo2 2013-09-16 08:28:27 -04:00
vladimir-v-diaz
076029d93d Merge branch 'demo2' of https://github.com/theupdateframework/tuf into demo2 2013-09-16 08:28:27 -04:00
zanefisher
0fd5e36909 Clean up after botched merge (oops). Add try/finally to endless data test to ensure temp files are always removed. 2013-09-14 16:58:01 -04:00
zanefisher
f3a8f60583 Clean up after botched merge (oops). Add try/finally to endless data test to ensure temp files are always removed. 2013-09-14 16:58:01 -04:00
zanefisher
0ff714cd40 Merge remote-tracking branch 'upstream/demo2' into demo2 2013-09-14 16:47:36 -04:00
zanefisher
4c39e27874 Merge remote-tracking branch 'upstream/demo2' into demo2 2013-09-14 16:47:36 -04:00
zanefisher
613cb19898 Bring back tuf/log.py from edec089965. 2013-09-14 16:47:04 -04:00
zanefisher
284998fc64 Bring back tuf/log.py from edec089965. 2013-09-14 16:47:04 -04:00
ttgump
c74a2d495f util_test_tools.init_repo parameter fix 2013-09-14 15:46:25 -04:00
ttgump
4c2f878870 util_test_tools.init_repo parameter fix 2013-09-14 15:46:25 -04:00
ttgump
a688a6d06f indention fix 2013-09-14 12:34:01 -07:00
ttgump
cd805e528d indention fix 2013-09-14 12:34:01 -07:00
ttgump
2fc73dd468 Merge remote-tracking branch 'origin/demo2' into demo2 2013-09-14 12:31:15 -07:00
ttgump
dccd5fc7df Merge remote-tracking branch 'origin/demo2' into demo2 2013-09-14 12:31:15 -07:00
dachshund
e003db34c5 Add a log message. 2013-09-14 00:07:26 -04:00
dachshund
6d7d645f23 Add a log message. 2013-09-14 00:07:26 -04:00
dachshund
8187be5232 Simplify exception text in console handler. 2013-09-13 23:47:37 -04:00
dachshund
d2b202bc61 Simplify exception text in console handler. 2013-09-13 23:47:37 -04:00
ttgump
384626cff9 test_mix_and_match_attack and test_indefinite_freeze_attack refactory fix 2013-09-13 19:14:32 -04:00
ttgump
3cf472757a test_mix_and_match_attack and test_indefinite_freeze_attack refactory fix 2013-09-13 19:14:32 -04:00
zanefisher
4a08c0c25e Redo accidentally undone changes. 2013-09-13 18:52:47 -04:00