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 | f97f301b5b5605f559522ffae2159fc4d061817c (patch) | |
| tree | cc8a921f105b35e10b9d0bd8a65d1d39cbf498fb | |
| parent | dc3890439f156d4c79b153f13f7ecf3393362b29 (diff) | |
| parent | 461e34bb3dec0f4f7234584806a224040f44c7ed (diff) | |
| download | tor-f97f301b5b5605f559522ffae2159fc4d061817c.tar.gz tor-f97f301b5b5605f559522ffae2159fc4d061817c.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.8
| -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 829a1b7aea..037c5fadd9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1469,7 +1469,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit, 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) { |