Browse Source

Merge branch 'maint-0.2.9' into maint-0.3.0

Nick Mathewson 6 years ago
parent
commit
3bca705c54
2 changed files with 4 additions and 1 deletions
  1. 3 0
      changes/bug24480
  2. 1 1
      src/or/rendservice.c

+ 3 - 0
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.

+ 1 - 1
src/or/rendservice.c

@@ -1879,7 +1879,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) {