Browse Source

Update trunnel code.

This gets the minor change in trunnel 1.4.1, which should avoid
deadcode warnings from Coverity.
Nick Mathewson 9 years ago
parent
commit
e045c3e1e8

+ 1 - 1
src/ext/trunnel/trunnel-impl.h

@@ -1,4 +1,4 @@
-/* trunnel-impl.h -- copied from Trunnel v1.2
+/* trunnel-impl.h -- copied from Trunnel v1.4.1
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

+ 1 - 1
src/ext/trunnel/trunnel.c

@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.4-pre
+/* trunnel.c -- copied from Trunnel v1.4.1
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

+ 1 - 1
src/ext/trunnel/trunnel.h

@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.2
+/* trunnel.h -- copied from Trunnel v1.4.1
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

+ 2 - 2
src/trunnel/ed25519_cert.c

@@ -1,4 +1,4 @@
-/* ed25519_cert.c -- generated by Trunnel v1.2.
+/* ed25519_cert.c -- generated by Trunnel v1.4.1.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -862,7 +862,7 @@ ed25519_cert_parse_into(ed25519_cert_t *obj, const uint8_t *input, const size_t
  truncated:
   return -2;
  relay_fail:
-  if (result >= 0) result = -1;
+  trunnel_assert(result < 0);
   return result;
  trunnel_alloc_failed:
   return -1;

+ 1 - 1
src/trunnel/ed25519_cert.h

@@ -1,4 +1,4 @@
-/* ed25519_cert.h -- generated by by Trunnel v1.2.
+/* ed25519_cert.h -- generated by by Trunnel v1.4.1.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

+ 2 - 2
src/trunnel/link_handshake.c

@@ -1,4 +1,4 @@
-/* link_handshake.c -- generated by Trunnel v1.4-pre.
+/* link_handshake.c -- generated by Trunnel v1.4.1.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -1863,7 +1863,7 @@ certs_cell_parse_into(certs_cell_t *obj, const uint8_t *input, const size_t len_
  truncated:
   return -2;
  relay_fail:
-  if (result >= 0) result = -1;
+  trunnel_assert(result < 0);
   return result;
  trunnel_alloc_failed:
   return -1;

+ 1 - 1
src/trunnel/link_handshake.h

@@ -1,4 +1,4 @@
-/* link_handshake.h -- generated by by Trunnel v1.4-pre.
+/* link_handshake.h -- generated by by Trunnel v1.4.1.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

+ 1 - 1
src/trunnel/pwbox.c

@@ -1,4 +1,4 @@
-/* pwbox.c -- generated by Trunnel v1.2.
+/* pwbox.c -- generated by Trunnel v1.4.1.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

+ 1 - 1
src/trunnel/pwbox.h

@@ -1,4 +1,4 @@
-/* pwbox.h -- generated by by Trunnel v1.2.
+/* pwbox.h -- generated by by Trunnel v1.4.1.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */