Commit graph

1590 commits

Author SHA1 Message Date
vladdd
0a94661d99 Fix print statements and help with python 3 compatability
test_arbitrary_package_attack.py.
2013-09-23 20:52:16 -04:00
vladdd
de6a5161c4 Add missing docstring to remove_console_handler() and minor edits 2013-09-23 19:54:47 -04:00
vladdd
c65a1aaf38 Fix link that discusses setting the time for all logging formatters 2013-09-23 19:33:25 -04:00
zanefisher
076a0adc2e Merge remote-tracking branch 'upstream/develop' into develop 2013-09-23 16:17:58 -04:00
vladdd
2163400892 Fix how the private key is checked prior to verifying a signature 2013-09-23 14:33:55 -04:00
vladdd
cbb76d1a80 Fix ignored placeholder variable names
'junk' signifies that this variable is not needed and thus discarded, however, it hides what is returned.  Include the junk and what is returned so the variable name is more descriptive.
2013-09-23 14:17:36 -04:00
vladdd
312e6398d6 Fix typo: missing the word 'key' 2013-09-23 14:04:13 -04:00
vladdd
7d691011e5 Resolve conflicts from demo 2 updates 2013-09-23 13:38:18 -04:00
vladdd
eecdca2105 Merge branch 'develop' of https://github.com/theupdateframework/tuf into develop 2013-09-19 09:27:48 -04:00
dachshund
d7899e536b Fix typo. 2013-09-18 03:18:51 -04:00
dachshund
4f7e8f5fba Fix typo. 2013-09-18 03:18:51 -04:00
dachshund
ab7804967b Merge remote-tracking branch 'origin/develop' into develop 2013-09-18 03:13:32 -04:00
dachshund
e64396f702 Merge remote-tracking branch 'origin/develop' into develop 2013-09-18 03:13:32 -04:00
dachshund
85125c4a4f Better error formatting. 2013-09-18 03:12:39 -04:00
dachshund
8d3bffa10c Better error formatting. 2013-09-18 03:12:39 -04:00
dachshund
6e28eee452 Merge branch 'demo2' into develop 2013-09-17 23:38:06 -04:00
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