diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-01 12:13:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-01 12:13:40 -0500 |
| commit | 953a8f851081e6157e9296186c296ab10106b7eb (patch) | |
| tree | f370971d890c5e0608b6bbb05331bcdb4f22b0af | |
| parent | 495db72c1eee7f9ed890ae252eb5b61a70438065 (diff) | |
| parent | f97f301b5b5605f559522ffae2159fc4d061817c (diff) | |
| download | tor-953a8f851081e6157e9296186c296ab10106b7eb.tar.gz tor-953a8f851081e6157e9296186c296ab10106b7eb.zip | |
Merge branch 'maint-0.2.8' into maint-0.2.9
| -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 455fc82854..a8c383444d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1816,7 +1816,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) { |