6 files changed, 62 insertions, 6 deletions
diff --git a/src/test/slow_ed25519.py b/src/test/slow_ed25519.py
index afad678000..be4eeab857 100644
--- a/src/test/slow_ed25519.py
+++ b/src/test/slow_ed25519.py
@@ -1,5 +1,5 @@
 # This is the ed25519 implementation from
-#     http://ed25519.cr.yp.to/python/ed25519.py .
+#     https://ed25519.cr.yp.to/python/ed25519.py .
 # It is in the public domain.
 #
 # It isn't constant-time.  Don't use it except for testing.  Also, see
diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index 849cc497fc..2b723b4a8d 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -16,6 +16,10 @@
 /* For packed_cell stuff */
 #define RELAY_PRIVATE
 #include "core/or/relay.h"
+/* For channel_tls_t object and private functions. */
+#define CHANNEL_OBJECT_PRIVATE
+#define CHANNELTLS_PRIVATE
+#include "core/or/channeltls.h"
 /* For init/free stuff */
 #include "core/or/scheduler.h"
 #include "feature/nodelist/networkstatus.h"
@@ -25,6 +29,8 @@
 #include "core/or/origin_circuit_st.h"
 #include "feature/nodelist/routerstatus_st.h"
 #include "core/or/var_cell_st.h"
+#include "core/or/or_connection_st.h"
+#include "lib/net/inaddr.h"
 
 /* Test suite stuff */
 #include "test/log_test_helpers.h"
@@ -1537,6 +1543,54 @@ test_channel_listener(void *arg)
   channel_free_all();
 }
 
+#define TEST_SETUP_MATCHES_ADDR(orcon, addr, src, rv) STMT_BEGIN \
+    rv = tor_inet_pton(addr.family, src, &addr.addr); \
+    tt_int_op(rv, OP_EQ, 1); \
+    orcon->real_addr = addr; \
+  STMT_END;
+
+#define TEST_MATCHES_ADDR(chan, addr4, addr6, rv, exp) STMT_BEGIN       \
+     rv = channel_matches_target_addr_for_extend(chan, addr4, addr6);   \
+    tt_int_op(rv, OP_EQ, exp); \
+  STMT_END;
+
+static void
+test_channel_matches_target_addr_for_extend(void *arg)
+{
+  (void) arg;
+
+  channel_tls_t *tlschan = tor_malloc_zero(sizeof(*tlschan));
+  or_connection_t *orcon = tor_malloc_zero(sizeof(*orcon));
+  channel_t *chan = &(tlschan->base_);
+  tor_addr_t addr;
+  int rv;
+
+  tlschan->conn = orcon;
+  channel_tls_common_init(tlschan);
+
+  /* Test for IPv4 addresses. */
+  addr.family = AF_INET;
+  TEST_SETUP_MATCHES_ADDR(orcon, addr, "1.2.3.4", rv);
+  TEST_MATCHES_ADDR(chan, &addr, NULL, rv, 1);
+
+  tor_inet_pton(addr.family, "2.5.3.4", &addr.addr);
+  TEST_MATCHES_ADDR(chan, &addr, NULL, rv, 0);
+
+  /* Test for IPv6 addresses. */
+  addr.family = AF_INET6;
+  TEST_SETUP_MATCHES_ADDR(orcon, addr, "3:4:7:1:9:8:09:10", rv);
+  TEST_MATCHES_ADDR(chan, NULL, &addr, rv, 1);
+
+  tor_inet_pton(addr.family, "::", &addr.addr);
+  TEST_MATCHES_ADDR(chan, NULL, &addr, rv, 0);
+
+ done:
+  circuitmux_clear_policy(chan->cmux);
+  circuitmux_free(chan->cmux);
+  tor_free(orcon);
+  tor_free(tlschan);
+}
+
 struct testcase_t channel_tests[] = {
   { "inbound_cell", test_channel_inbound_cell, TT_FORK,
     NULL, NULL },
@@ -1558,5 +1612,7 @@ struct testcase_t channel_tests[] = {
     NULL, NULL },
   { "listener", test_channel_listener, TT_FORK,
     NULL, NULL },
+  { "matches_target", test_channel_matches_target_addr_for_extend, TT_FORK,
+    NULL, NULL },
   END_OF_TESTCASES
 };
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 56319f2c72..1702427b08 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -342,7 +342,7 @@ test_crypto_scrypt_vectors(void *arg)
 #endif
 
   /* Test vectors from
-     http://tools.ietf.org/html/draft-josefsson-scrypt-kdf-00 section 11.
+     https://tools.ietf.org/html/draft-josefsson-scrypt-kdf-00 section 11.
 
      Note that the names of 'r' and 'N' are switched in that section. Or
      possibly in libscrypt.
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 9cd1d11d29..8e0d19f126 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -2362,7 +2362,7 @@ test_options_validate__rend(void *ignored)
   expect_log_msg("UseEntryGuards is disabled, but you"
             " have configured one or more hidden services on this Tor "
             "instance.  Your hidden services will be very easy to locate using"
-            " a well-known attack -- see http://freehaven.net/anonbib/#hs-"
+            " a well-known attack -- see https://freehaven.net/anonbib/#hs-"
             "attack06 for details.\n");
   tor_free(msg);
 
@@ -2378,7 +2378,7 @@ test_options_validate__rend(void *ignored)
   expect_no_log_msg("UseEntryGuards is disabled, but you"
             " have configured one or more hidden services on this Tor "
             "instance.  Your hidden services will be very easy to locate using"
-            " a well-known attack -- see http://freehaven.net/anonbib/#hs-"
+            " a well-known attack -- see https://freehaven.net/anonbib/#hs-"
             "attack06 for details.\n");
 
   free_options_test_data(tdata);
diff --git a/src/test/test_prob_distr.c b/src/test/test_prob_distr.c
index c5423ce14a..541a81df3a 100644
--- a/src/test/test_prob_distr.c
+++ b/src/test/test_prob_distr.c
@@ -893,7 +893,7 @@ test_uniform_interval(void *arg)
  *
  *  NIST/SEMATECH e-Handbook of Statistical Methods, Section
  *  1.3.6.7.4 `Critical Values of the Chi-Square Distribution',
- *  <http://www.itl.nist.gov/div898/handbook/eda/section3/eda3674.htm>,
+ *  <https://www.itl.nist.gov/div898/handbook/eda/section3/eda3674.htm>,
  *  retrieved 2018-10-28.
  */
 
diff --git a/src/test/test_util.c b/src/test/test_util.c
index b2ee7cd35c..7700cfa2b1 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -5651,7 +5651,7 @@ test_util_hostname_validation(void *arg)
   tt_assert(string_is_valid_nonrfc_hostname("luck.y13."));
 
   // We allow punycode TLDs. For examples, see
-  // http://data.iana.org/TLD/tlds-alpha-by-domain.txt
+  // https://data.iana.org/TLD/tlds-alpha-by-domain.txt
   tt_assert(string_is_valid_nonrfc_hostname("example.xn--l1acc"));
 
   done: