commit e045c3e1e8a4b455ca4e6ee4429a0b5b02382f75 Author: Nick Mathewson nickm@torproject.org Date: Thu May 28 12:44:52 2015 -0400

Update trunnel code.

This gets the minor change in trunnel 1.4.1, which should avoid deadcode warnings from Coverity. --- src/ext/trunnel/trunnel-impl.h | 2 +- src/ext/trunnel/trunnel.c | 2 +- src/ext/trunnel/trunnel.h | 2 +- src/trunnel/ed25519_cert.c | 4 ++-- src/trunnel/ed25519_cert.h | 2 +- src/trunnel/link_handshake.c | 4 ++-- src/trunnel/link_handshake.h | 2 +- src/trunnel/pwbox.c | 2 +- src/trunnel/pwbox.h | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index 8714fde..d98dc34 100644 --- a/src/ext/trunnel/trunnel-impl.h +++ b/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. */ diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index 7353237..ce8db4d 100644 --- a/src/ext/trunnel/trunnel.c +++ b/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. */ diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h index 22c1ed8..78da904 100644 --- a/src/ext/trunnel/trunnel.h +++ b/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. */ diff --git a/src/trunnel/ed25519_cert.c b/src/trunnel/ed25519_cert.c index 2a84e4b..6931eae 100644 --- a/src/trunnel/ed25519_cert.c +++ b/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; diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h index 3ddf95e..7839af4 100644 --- a/src/trunnel/ed25519_cert.h +++ b/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. */ diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c index 9630d13..f53161a 100644 --- a/src/trunnel/link_handshake.c +++ b/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; diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h index 109fe8d..6da6599 100644 --- a/src/trunnel/link_handshake.h +++ b/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. */ diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c index bfea3ac..28a4f74 100644 --- a/src/trunnel/pwbox.c +++ b/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. */ diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h index 5b170eb..a6964b5 100644 --- a/src/trunnel/pwbox.h +++ b/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. */