diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-01 12:13:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-01 12:13:39 -0500 |
| commit | 20ca62ffb5dd3640c7d3054612c158c08d8ee677 (patch) | |
| tree | cbf36d5454ab9080372f74c7326877e22a7564a0 | |
| parent | 9cb1c2b4ad37f7af1c0d58858f0e5fbe04f33730 (diff) | |
| parent | 461e34bb3dec0f4f7234584806a224040f44c7ed (diff) | |
| download | tor-20ca62ffb5dd3640c7d3054612c158c08d8ee677.tar.gz tor-20ca62ffb5dd3640c7d3054612c158c08d8ee677.zip | |
Merge branch 'maint-0.2.5' into release-0.2.5
| -rw-r--r-- | changes/bug24480 | 3 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug24480 b/changes/bug24480 new file mode 100644 index 0000000000..94e5b91a0c --- /dev/null +++ b/changes/bug24480 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix a signed/unsigned comparison warning introduced by our + fix to TROVE-2017-009. Fixes bug 24480; bugfix on 0.2.5.16. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ba8891eade..80e1e10a05 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1162,7 +1162,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, time_t now = time(NULL); time_t elapsed; int replay; - size_t keylen; + ssize_t keylen; /* Do some initial validation and logging before we parse the cell */ if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) { |