diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-12 14:06:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-12 14:06:14 -0500 |
| commit | 2edfdc02a29e73a01f360f257d8dfe916a7a5b45 (patch) | |
| tree | dccbc5984ff04448ef264d9bcdb404e5f0a85b46 /changes | |
| parent | cacea9102a2431ce8e7e431629a91a43331ac9f9 (diff) | |
| parent | f8ffb57bc4430ff9bbd7560eecdda4284b2799ba (diff) | |
| download | tor-2edfdc02a29e73a01f360f257d8dfe916a7a5b45.tar.gz tor-2edfdc02a29e73a01f360f257d8dfe916a7a5b45.zip | |
Merge remote-tracking branch 'teor/bug13111-empty-key-files-fn-empty'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug13111-generate-keys-on-empty-file | 23 | ||||
| -rw-r--r-- | changes/bug14001-clang-warning | 6 |
2 files changed, 29 insertions, 0 deletions
diff --git a/changes/bug13111-generate-keys-on-empty-file b/changes/bug13111-generate-keys-on-empty-file new file mode 100644 index 0000000000..20c10c7443 --- /dev/null +++ b/changes/bug13111-generate-keys-on-empty-file @@ -0,0 +1,23 @@ + o Minor bugfixes (file handling): + - Stop failing when key files are zero-length. Instead, generate new + keys, and overwrite the empty key files. + Fixes bug 13111. Patch by "teor". + - Stop generating a fresh .old RSA key file when the .old file is missing. + - Avoid overwriting .old key files with empty key files. + - Stop crashing when a NULL filename is passed to file_status(). + Fixed as part of bug 13111. Patches by "teor". + + o Minor enhancements (file handling): + - Skip loading zero-length extra info store, router store, stats, state, + and key files. + - Return FN_ERROR when a zero-length filename is passed to file_status(). + Fixed as part of bug 13111. Patches by "teor". + + o Minor enhancements (testing): + - Test that tor does not fail when key files are zero-length. + Check that tor generates new keys, and overwrites the empty key files. + - Test that tor generates new keys when keys are missing (existing + behaviour). + - Test that tor does not overwrite key files that already contain data + (existing behaviour). + Tests bug 13111. Patch by "teor". diff --git a/changes/bug14001-clang-warning b/changes/bug14001-clang-warning new file mode 100644 index 0000000000..b932af6ab7 --- /dev/null +++ b/changes/bug14001-clang-warning @@ -0,0 +1,6 @@ + o Minor bugfixes: + - The address of an array in the middle of a structure will + always be non-NULL. clang recognises this and complains. + Disable the tautologous and redundant check to silence + this warning. + Fixes bug 14001. |