[or-cvs] r20670: {} Update SVN to actually match git master, revision 891b3d8633 (in tor/trunk: . contrib src/common src/or)

nickm at seul.org nickm at seul.org
Fri Sep 25 17:51:03 UTC 2009


Author: nickm
Date: 2009-09-25 13:51:03 -0400 (Fri, 25 Sep 2009)
New Revision: 20670

Added:
   tor/trunk/.gitignore
Removed:
   tor/trunk/contrib/auto-naming/
   tor/trunk/src/common/test.h
   tor/trunk/src/or/test.c
   tor/trunk/src/or/test_data.c
Log:
Update SVN to actually match git master, revision 891b3d8633ba8f82

Added: tor/trunk/.gitignore
===================================================================
--- tor/trunk/.gitignore	                        (rev 0)
+++ tor/trunk/.gitignore	2009-09-25 17:51:03 UTC (rev 20670)
@@ -0,0 +1,147 @@
+# Editor droppings
+\#*\#
+.#*
+*~
+*.swp
+# C stuff
+*.o
+# Diff droppings
+*.orig
+*.rej
+# gcov stuff
+*.gcno
+*.gcov
+*.gcda
+# latex stuff
+*.aux
+*.dvi
+*.blg
+*.bbl
+*.log
+# Autotools stuff
+.deps
+# Stuff made by our makefiles
+*.bak
+
+# /
+/Makefile
+/Makefile.in
+/aclocal.m4
+/autom4te.cache
+/build-stamp
+/configure
+/Doxyfile
+/orconfig.h
+/orconfig.h.in
+/config.cache
+/config.log
+/config.status
+/config.guess
+/config.sub
+/conftest*
+/patch-stamp
+/stamp-h
+/stamp-h.in
+/stamp-h1
+/tor.sh
+/tor.spec
+/depcomp
+/install-sh
+/missing
+/mkinstalldirs
+/Tor*Bundle.dmg
+/tor-*-win32.exe
+
+# /contrib/
+/contrib/Makefile
+/contrib/Makefile.in
+/contrib/tor.sh
+/contrib/torctl
+/contrib/torify
+/contrib/*.pyc
+/contrib/*.pyo
+/contrib/tor.logrotate
+/contrib/tor.wxs
+
+# /contrib/osx/
+/contrib/osx/Makefile
+/contrib/osx/Makefile.in
+/contrib/osx/TorBundleDesc.plist
+/contrib/osx/TorBundleInfo.plist
+/contrib/osx/TorDesc.plist
+/contrib/osx/TorInfo.plist
+/contrib/osx/TorStartupDesc.plist
+/contrib/osx/net.freehaven.tor.plist
+
+# /contrib/suse/
+/contrib/suse/tor.sh
+/contrib/suse/Makefile.in
+/contrib/suse/Makefile
+
+# /debian/
+/debian/files
+/debian/micro-revision.i
+/debian/patched
+/debian/tor
+/debian/tor.postinst.debhelper
+/debian/tor.postrm.debhelper
+/debian/tor.prerm.debhelper
+/debian/tor.substvars
+
+# /doc/
+/doc/Makefile
+/doc/Makefile.in
+/doc/tor.1
+/doc/doxygen
+
+# /doc/design-paper/
+/doc/design-paper/Makefile
+/doc/design-paper/Makefile.in
+
+# /doc/spec/
+/doc/spec/Makefile
+/doc/spec/Makefile.in
+
+# /src/
+/src/Makefile
+/src/Makefile.in
+
+# /src/common/
+/src/common/Makefile
+/src/common/Makefile.in
+/src/common/common_sha1.i
+/src/common/libor.a
+/src/common/libor-crypto.a
+/src/common/libor-event.a
+
+# /src/config/
+/src/config/Makefile
+/src/config/Makefile.in
+/src/config/sample-server-torrc
+/src/config/torrc
+/src/config/torrc.sample
+
+# /src/or/
+/src/or/Makefile
+/src/or/Makefile.in
+/src/or/or_sha1.i
+/src/or/micro-revision.*
+/src/or/tor
+/src/or/libtor.a
+
+# /src/test
+/src/test/Makefile
+/src/test/Makefile.in
+/src/test/test
+
+
+# /src/tools/
+/src/tools/tor-checkkey
+/src/tools/tor-resolve
+/src/tools/tor-gencert
+/src/tools/Makefile
+/src/tools/Makefile.in
+
+# /src/win32/
+/src/win32/Makefile
+/src/win32/Makefile.in

Deleted: tor/trunk/src/common/test.h
===================================================================
--- tor/trunk/src/common/test.h	2009-09-25 17:06:41 UTC (rev 20669)
+++ tor/trunk/src/common/test.h	2009-09-25 17:51:03 UTC (rev 20670)
@@ -1,184 +0,0 @@
-/* Copyright (c) 2001-2003, Roger Dingledine.
- * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2009, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-#ifndef _TOR_TEST_H
-#define _TOR_TEST_H
-
-/**
- * \file test.h
- * \brief Macros used by unit tests.
- */
-
-#include "compat.h"
-
-#ifdef __GNUC__
-#define PRETTY_FUNCTION __PRETTY_FUNCTION__
-#else
-#define PRETTY_FUNCTION ""
-#endif
-
-#define test_fail_msg(msg)                                      \
-  STMT_BEGIN                                                    \
-    have_failed = 1;                                            \
-    printf("\nFile %s: line %d (%s): %s",                       \
-      _SHORT_FILE_,                                             \
-      __LINE__,                                                 \
-      PRETTY_FUNCTION,                                          \
-      msg);                                                     \
-    goto done;                                                  \
-  STMT_END
-
-#define test_fail() test_fail_msg("Assertion failed.")
-
-#define test_assert(expr)                                       \
-  STMT_BEGIN                                                    \
-  if (expr) { printf("."); fflush(stdout); } else {             \
-    have_failed = 1;                                            \
-    printf("\nFile %s: line %d (%s): assertion failed: (%s)\n", \
-      _SHORT_FILE_,                                             \
-      __LINE__,                                                 \
-      PRETTY_FUNCTION,                                          \
-      #expr);                                                   \
-    goto done;                                                  \
-  } STMT_END
-
-#define test_eq_type(tp, fmt, expr1, expr2) \
-  STMT_BEGIN                                                            \
-  tp _test_v1=(tp)(expr1);                                              \
-  tp _test_v2=(tp)(expr2);                                              \
-  if (_test_v1==_test_v2) { printf("."); fflush(stdout); } else {       \
-    have_failed = 1;                                                    \
-    printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n"      \
-           "      "fmt "!="fmt"\n",                                     \
-             _SHORT_FILE_,                                              \
-             __LINE__,                                                  \
-             PRETTY_FUNCTION,                                           \
-             #expr1, #expr2,                                            \
-           _test_v1, _test_v2);                                         \
-    goto done;                                                          \
-  } STMT_END
-
-#define test_eq(expr1, expr2)                   \
-  test_eq_type(long, "%ld", expr1, expr2)
-
-#define test_eq_ptr(expr1, expr2)               \
-  test_eq_type(void*, "%p", expr1, expr2)
-
-#define test_neq_type(tp, fmt, expr1, expr2)                            \
-  STMT_BEGIN                                                            \
-  tp _test_v1=(tp)(expr1);                                              \
-  tp _test_v2=(tp)(expr2);                                              \
-  if (_test_v1!=_test_v2) { printf("."); fflush(stdout); } else {       \
-    have_failed = 1;                                                    \
-    printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n"      \
-           "      ("fmt" == "fmt")\n",                                  \
-           _SHORT_FILE_,                                                \
-           __LINE__,                                                    \
-           PRETTY_FUNCTION,                                             \
-           #expr1, #expr2,                                              \
-           _test_v1, _test_v2);                                         \
-    goto done;                                                          \
-  } STMT_END
-
-#define test_neq(expr1, expr2)                  \
-  test_neq_type(long, "%ld", expr1, expr2)
-
-#define test_neq_ptr(expr1, expr2)              \
-  test_neq_type(void *, "%p", expr1, expr2)
-
-#define test_streq(expr1, expr2)                                \
-  STMT_BEGIN                                                    \
-    const char *_test_v1=(expr1), *_test_v2=(expr2);                        \
-    if (!strcmp(_test_v1,_test_v2)) { printf("."); fflush(stdout); } else { \
-    have_failed = 1;                                            \
-    printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n"\
-           "      (\"%s\" != \"%s\")\n",                        \
-      _SHORT_FILE_,                                             \
-      __LINE__,                                                 \
-      PRETTY_FUNCTION,                                          \
-      #expr1, #expr2,                                           \
-      _test_v1, _test_v2);                                      \
-    goto done;                                                  \
-  } STMT_END
-
-#define test_strneq(expr1, expr2)                               \
-  STMT_BEGIN                                                    \
-    const char *_test_v1=(expr1), *_test_v2=(expr2);                        \
-    if (strcmp(_test_v1,_test_v2)) { printf("."); fflush(stdout); } else {  \
-    have_failed = 1;                                            \
-    printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n"\
-           "      (\"%s\" == \"%s\")\n",                        \
-      _SHORT_FILE_,                                             \
-      __LINE__,                                                 \
-      PRETTY_FUNCTION,                                          \
-      #expr1, #expr2,                                           \
-      _test_v1, _test_v2);                                      \
-    goto done;                                                  \
-  } STMT_END
-
-#define test_memeq(expr1, expr2, len)                           \
-  STMT_BEGIN                                                    \
-    const void *_test_v1=(expr1), *_test_v2=(expr2);            \
-    char *mem1, *mem2;                                          \
-    if (!memcmp(_test_v1,_test_v2,(len))) {                     \
-      printf("."); fflush(stdout); } else {                     \
-    have_failed = 1;                                            \
-    mem1 = tor_malloc(len*2+1);                                    \
-    mem2 = tor_malloc(len*2+1);                                    \
-    base16_encode(mem1, len*2+1, _test_v1, len);                   \
-    base16_encode(mem2, len*2+1, _test_v2, len);                   \
-    printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n" \
-           "      %s != %s\n",                                     \
-      _SHORT_FILE_,                                             \
-      __LINE__,                                                 \
-      PRETTY_FUNCTION,                                          \
-      #expr1, #expr2, mem1, mem2);                              \
-    tor_free(mem1);                                             \
-    tor_free(mem2);                                             \
-    goto done;                                                  \
-  } STMT_END
-
-#define test_memeq_hex(expr1, hex)                                      \
-  STMT_BEGIN                                                            \
-    const char *_test_v1 = (char*)(expr1);                              \
-    const char *_test_v2 = (hex);                                       \
-    size_t _len_v2 = strlen(_test_v2);                                  \
-    char *_mem2 = tor_malloc(_len_v2/2);                                \
-    tor_assert((_len_v2 & 1) == 0);                                     \
-    base16_decode(_mem2, _len_v2/2, _test_v2, _len_v2);                 \
-    if (!memcmp(_mem2, _test_v1, _len_v2/2)) {                          \
-      printf("."); fflush(stdout); } else {                             \
-      char *_mem1 = tor_malloc(_len_v2+1);                              \
-      base16_encode(_mem1, _len_v2+1, _test_v1, _len_v2/2);             \
-      printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n"    \
-             "      %s != %s\n",                                        \
-             _SHORT_FILE_,                                              \
-             __LINE__,                                                  \
-             PRETTY_FUNCTION,                                           \
-             #expr1, _test_v2, _mem1, _test_v2);                        \
-      tor_free(_mem1);                                                  \
-      tor_free(_mem2);                                                  \
-      goto done;                                                        \
-    }                                                                   \
-    tor_free(_mem2);                                                    \
-  STMT_END
-
-#define test_memneq(expr1, expr2, len)                          \
-  STMT_BEGIN                                                    \
-   void *_test_v1=(expr1), *_test_v2=(expr2);                   \
-   if (memcmp(_test_v1,_test_v2,(len))) {                       \
-     printf("."); fflush(stdout);                               \
-   } else {                                                     \
-    have_failed = 1;                                            \
-    printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n", \
-      _SHORT_FILE_,                                             \
-      __LINE__,                                                 \
-      PRETTY_FUNCTION,                                          \
-      #expr1, #expr2);                                          \
-    goto done;                                                  \
-  } STMT_END
-
-#endif
-

Deleted: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2009-09-25 17:06:41 UTC (rev 20669)
+++ tor/trunk/src/or/test.c	2009-09-25 17:51:03 UTC (rev 20670)
@@ -1,4950 +0,0 @@
-/* Copyright (c) 2001-2004, Roger Dingledine.
- * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2009, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-/* Ordinarily defined in tor_main.c; this bit is just here to provide one
- * since we're not linking to tor_main.c */
-const char tor_svn_revision[] = "";
-
-/**
- * \file test.c
- * \brief Unit tests for many pieces of the lower level Tor modules.
- **/
-
-#include "orconfig.h"
-
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef MS_WINDOWS
-/* For mkdir() */
-#include <direct.h>
-#else
-#include <dirent.h>
-#endif
-
-/* These macros pull in declarations for some functions and structures that
- * are typically file-private. */
-#define BUFFERS_PRIVATE
-#define CONFIG_PRIVATE
-#define CONTROL_PRIVATE
-#define CRYPTO_PRIVATE
-#define DIRSERV_PRIVATE
-#define DIRVOTE_PRIVATE
-#define GEOIP_PRIVATE
-#define MEMPOOL_PRIVATE
-#define ROUTER_PRIVATE
-
-#include "or.h"
-#include "test.h"
-#include "torgzip.h"
-#include "mempool.h"
-#include "memarea.h"
-
-#ifdef USE_DMALLOC
-#include <dmalloc.h>
-#include <openssl/crypto.h>
-#endif
-
-/** Set to true if any unit test has failed.  Mostly, this is set by the macros
- * in test.h */
-int have_failed = 0;
-
-/** Temporary directory (set up by setup_directory) under which we store all
- * our files during testing. */
-static char temp_dir[256];
-
-/** Select and create the temporary directory we'll use to run our unit tests.
- * Store it in <b>temp_dir</b>.  Exit immediately if we can't create it.
- * idempotent. */
-static void
-setup_directory(void)
-{
-  static int is_setup = 0;
-  int r;
-  if (is_setup) return;
-
-#ifdef MS_WINDOWS
-  // XXXX
-  tor_snprintf(temp_dir, sizeof(temp_dir),
-               "c:\\windows\\temp\\tor_test_%d", (int)getpid());
-  r = mkdir(temp_dir);
-#else
-  tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d", (int) getpid());
-  r = mkdir(temp_dir, 0700);
-#endif
-  if (r) {
-    fprintf(stderr, "Can't create directory %s:", temp_dir);
-    perror("");
-    exit(1);
-  }
-  is_setup = 1;
-}
-
-/** Return a filename relative to our testing temporary directory */
-static const char *
-get_fname(const char *name)
-{
-  static char buf[1024];
-  setup_directory();
-  tor_snprintf(buf,sizeof(buf),"%s/%s",temp_dir,name);
-  return buf;
-}
-
-/** Remove all files stored under the temporary directory, and the directory
- * itself. */
-static void
-remove_directory(void)
-{
-  smartlist_t *elements = tor_listdir(temp_dir);
-  if (elements) {
-    SMARTLIST_FOREACH(elements, const char *, cp,
-       {
-         size_t len = strlen(cp)+strlen(temp_dir)+16;
-         char *tmp = tor_malloc(len);
-         tor_snprintf(tmp, len, "%s"PATH_SEPARATOR"%s", temp_dir, cp);
-         unlink(tmp);
-         tor_free(tmp);
-       });
-    SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp));
-    smartlist_free(elements);
-  }
-  rmdir(temp_dir);
-}
-
-/** Define this if unit tests spend too much time generating public keys*/
-#undef CACHE_GENERATED_KEYS
-
-static crypto_pk_env_t *pregen_keys[5] = {NULL, NULL, NULL, NULL, NULL};
-#define N_PREGEN_KEYS ((int)(sizeof(pregen_keys)/sizeof(pregen_keys[0])))
-
-/** Generate and return a new keypair for use in unit tests.  If we're using
- * the key cache optimization, we might reuse keys: we only guarantee that
- * keys made with distinct values for <b>idx</b> are different.  The value of
- * <b>idx</b> must be at least 0, and less than N_PREGEN_KEYS. */
-static crypto_pk_env_t *
-pk_generate(int idx)
-{
-#ifdef CACHE_GENERATED_KEYS
-  tor_assert(idx < N_PREGEN_KEYS);
-  if (! pregen_keys[idx]) {
-    pregen_keys[idx] = crypto_new_pk_env();
-    tor_assert(!crypto_pk_generate_key(pregen_keys[idx]));
-  }
-  return crypto_pk_dup_key(pregen_keys[idx]);
-#else
-  crypto_pk_env_t *result;
-  (void) idx;
-  result = crypto_new_pk_env();
-  tor_assert(!crypto_pk_generate_key(result));
-  return result;
-#endif
-}
-
-/** Free all storage used for the cached key optimization. */
-static void
-free_pregenerated_keys(void)
-{
-  unsigned idx;
-  for (idx = 0; idx < N_PREGEN_KEYS; ++idx) {
-    if (pregen_keys[idx]) {
-      crypto_free_pk_env(pregen_keys[idx]);
-      pregen_keys[idx] = NULL;
-    }
-  }
-}
-
-/** Run unit tests for buffers.c */
-static void
-test_buffers(void)
-{
-  char str[256];
-  char str2[256];
-
-  buf_t *buf = NULL, *buf2 = NULL;
-  const char *cp;
-
-  int j;
-  size_t r;
-
-  /****
-   * buf_new
-   ****/
-  if (!(buf = buf_new()))
-    test_fail();
-
-  //test_eq(buf_capacity(buf), 4096);
-  test_eq(buf_datalen(buf), 0);
-
-  /****
-   * General pointer frobbing
-   */
-  for (j=0;j<256;++j) {
-    str[j] = (char)j;
-  }
-  write_to_buf(str, 256, buf);
-  write_to_buf(str, 256, buf);
-  test_eq(buf_datalen(buf), 512);
-  fetch_from_buf(str2, 200, buf);
-  test_memeq(str, str2, 200);
-  test_eq(buf_datalen(buf), 312);
-  memset(str2, 0, sizeof(str2));
-
-  fetch_from_buf(str2, 256, buf);
-  test_memeq(str+200, str2, 56);
-  test_memeq(str, str2+56, 200);
-  test_eq(buf_datalen(buf), 56);
-  memset(str2, 0, sizeof(str2));
-  /* Okay, now we should be 512 bytes into the 4096-byte buffer.  If we add
-   * another 3584 bytes, we hit the end. */
-  for (j=0;j<15;++j) {
-    write_to_buf(str, 256, buf);
-  }
-  assert_buf_ok(buf);
-  test_eq(buf_datalen(buf), 3896);
-  fetch_from_buf(str2, 56, buf);
-  test_eq(buf_datalen(buf), 3840);
-  test_memeq(str+200, str2, 56);
-  for (j=0;j<15;++j) {
-    memset(str2, 0, sizeof(str2));
-    fetch_from_buf(str2, 256, buf);
-    test_memeq(str, str2, 256);
-  }
-  test_eq(buf_datalen(buf), 0);
-  buf_free(buf);
-  buf = NULL;
-
-  /* Okay, now make sure growing can work. */
-  buf = buf_new_with_capacity(16);
-  //test_eq(buf_capacity(buf), 16);
-  write_to_buf(str+1, 255, buf);
-  //test_eq(buf_capacity(buf), 256);
-  fetch_from_buf(str2, 254, buf);
-  test_memeq(str+1, str2, 254);
-  //test_eq(buf_capacity(buf), 256);
-  assert_buf_ok(buf);
-  write_to_buf(str, 32, buf);
-  //test_eq(buf_capacity(buf), 256);
-  assert_buf_ok(buf);
-  write_to_buf(str, 256, buf);
-  assert_buf_ok(buf);
-  //test_eq(buf_capacity(buf), 512);
-  test_eq(buf_datalen(buf), 33+256);
-  fetch_from_buf(str2, 33, buf);
-  test_eq(*str2, str[255]);
-
-  test_memeq(str2+1, str, 32);
-  //test_eq(buf_capacity(buf), 512);
-  test_eq(buf_datalen(buf), 256);
-  fetch_from_buf(str2, 256, buf);
-  test_memeq(str, str2, 256);
-
-  /* now try shrinking: case 1. */
-  buf_free(buf);
-  buf = buf_new_with_capacity(33668);
-  for (j=0;j<67;++j) {
-    write_to_buf(str,255, buf);
-  }
-  //test_eq(buf_capacity(buf), 33668);
-  test_eq(buf_datalen(buf), 17085);
-  for (j=0; j < 40; ++j) {
-    fetch_from_buf(str2, 255,buf);
-    test_memeq(str2, str, 255);
-  }
-
-  /* now try shrinking: case 2. */
-  buf_free(buf);
-  buf = buf_new_with_capacity(33668);
-  for (j=0;j<67;++j) {
-    write_to_buf(str,255, buf);
-  }
-  for (j=0; j < 20; ++j) {
-    fetch_from_buf(str2, 255,buf);
-    test_memeq(str2, str, 255);
-  }
-  for (j=0;j<80;++j) {
-    write_to_buf(str,255, buf);
-  }
-  //test_eq(buf_capacity(buf),33668);
-  for (j=0; j < 120; ++j) {
-    fetch_from_buf(str2, 255,buf);
-    test_memeq(str2, str, 255);
-  }
-
-  /* Move from buf to buf. */
-  buf_free(buf);
-  buf = buf_new_with_capacity(4096);
-  buf2 = buf_new_with_capacity(4096);
-  for (j=0;j<100;++j)
-    write_to_buf(str, 255, buf);
-  test_eq(buf_datalen(buf), 25500);
-  for (j=0;j<100;++j) {
-    r = 10;
-    move_buf_to_buf(buf2, buf, &r);
-    test_eq(r, 0);
-  }
-  test_eq(buf_datalen(buf), 24500);
-  test_eq(buf_datalen(buf2), 1000);
-  for (j=0;j<3;++j) {
-    fetch_from_buf(str2, 255, buf2);
-    test_memeq(str2, str, 255);
-  }
-  r = 8192; /*big move*/
-  move_buf_to_buf(buf2, buf, &r);
-  test_eq(r, 0);
-  r = 30000; /* incomplete move */
-  move_buf_to_buf(buf2, buf, &r);
-  test_eq(r, 13692);
-  for (j=0;j<97;++j) {
-    fetch_from_buf(str2, 255, buf2);
-    test_memeq(str2, str, 255);
-  }
-  buf_free(buf);
-  buf_free(buf2);
-  buf = buf2 = NULL;
-
-  buf = buf_new_with_capacity(5);
-  cp = "Testing. This is a moderately long Testing string.";
-  for (j = 0; cp[j]; j++)
-    write_to_buf(cp+j, 1, buf);
-  test_eq(0, buf_find_string_offset(buf, "Testing", 7));
-  test_eq(1, buf_find_string_offset(buf, "esting", 6));
-  test_eq(1, buf_find_string_offset(buf, "est", 3));
-  test_eq(39, buf_find_string_offset(buf, "ing str", 7));
-  test_eq(35, buf_find_string_offset(buf, "Testing str", 11));
-  test_eq(32, buf_find_string_offset(buf, "ng ", 3));
-  test_eq(43, buf_find_string_offset(buf, "string.", 7));
-  test_eq(-1, buf_find_string_offset(buf, "shrdlu", 6));
-  test_eq(-1, buf_find_string_offset(buf, "Testing thing", 13));
-  test_eq(-1, buf_find_string_offset(buf, "ngx", 3));
-  buf_free(buf);
-  buf = NULL;
-
-#if 0
-  {
-  int s;
-  int eof;
-  int i;
-  buf_t *buf2;
-  /****
-   * read_to_buf
-   ****/
-  s = open(get_fname("data"), O_WRONLY|O_CREAT|O_TRUNC, 0600);
-  write(s, str, 256);
-  close(s);
-
-  s = open(get_fname("data"), O_RDONLY, 0);
-  eof = 0;
-  errno = 0; /* XXXX */
-  i = read_to_buf(s, 10, buf, &eof);
-  printf("%s\n", strerror(errno));
-  test_eq(i, 10);
-  test_eq(eof, 0);
-  //test_eq(buf_capacity(buf), 4096);
-  test_eq(buf_datalen(buf), 10);
-
-  test_memeq(str, (char*)_buf_peek_raw_buffer(buf), 10);
-
-  /* Test reading 0 bytes. */
-  i = read_to_buf(s, 0, buf, &eof);
-  //test_eq(buf_capacity(buf), 512*1024);
-  test_eq(buf_datalen(buf), 10);
-  test_eq(eof, 0);
-  test_eq(i, 0);
-
-  /* Now test when buffer is filled exactly. */
-  buf2 = buf_new_with_capacity(6);
-  i = read_to_buf(s, 6, buf2, &eof);
-  //test_eq(buf_capacity(buf2), 6);
-  test_eq(buf_datalen(buf2), 6);
-  test_eq(eof, 0);
-  test_eq(i, 6);
-  test_memeq(str+10, (char*)_buf_peek_raw_buffer(buf2), 6);
-  buf_free(buf2);
-  buf2 = NULL;
-
-  /* Now test when buffer is filled with more data to read. */
-  buf2 = buf_new_with_capacity(32);
-  i = read_to_buf(s, 128, buf2, &eof);
-  //test_eq(buf_capacity(buf2), 128);
-  test_eq(buf_datalen(buf2), 32);
-  test_eq(eof, 0);
-  test_eq(i, 32);
-  buf_free(buf2);
-  buf2 = NULL;
-
-  /* Now read to eof. */
-  test_assert(buf_capacity(buf) > 256);
-  i = read_to_buf(s, 1024, buf, &eof);
-  test_eq(i, (256-32-10-6));
-  test_eq(buf_capacity(buf), MAX_BUF_SIZE);
-  test_eq(buf_datalen(buf), 256-6-32);
-  test_memeq(str, (char*)_buf_peek_raw_buffer(buf), 10); /* XXX Check rest. */
-  test_eq(eof, 0);
-
-  i = read_to_buf(s, 1024, buf, &eof);
-  test_eq(i, 0);
-  test_eq(buf_capacity(buf), MAX_BUF_SIZE);
-  test_eq(buf_datalen(buf), 256-6-32);
-  test_eq(eof, 1);
-  }
-#endif
-
- done:
-  if (buf)
-    buf_free(buf);
-  if (buf2)
-    buf_free(buf2);
-}
-
-/** Run unit tests for Diffie-Hellman functionality. */
-static void
-test_crypto_dh(void)
-{
-  crypto_dh_env_t *dh1 = crypto_dh_new();
-  crypto_dh_env_t *dh2 = crypto_dh_new();
-  char p1[DH_BYTES];
-  char p2[DH_BYTES];
-  char s1[DH_BYTES];
-  char s2[DH_BYTES];
-  int s1len, s2len;
-
-  test_eq(crypto_dh_get_bytes(dh1), DH_BYTES);
-  test_eq(crypto_dh_get_bytes(dh2), DH_BYTES);
-
-  memset(p1, 0, DH_BYTES);
-  memset(p2, 0, DH_BYTES);
-  test_memeq(p1, p2, DH_BYTES);
-  test_assert(! crypto_dh_get_public(dh1, p1, DH_BYTES));
-  test_memneq(p1, p2, DH_BYTES);
-  test_assert(! crypto_dh_get_public(dh2, p2, DH_BYTES));
-  test_memneq(p1, p2, DH_BYTES);
-
-  memset(s1, 0, DH_BYTES);
-  memset(s2, 0xFF, DH_BYTES);
-  s1len = crypto_dh_compute_secret(dh1, p2, DH_BYTES, s1, 50);
-  s2len = crypto_dh_compute_secret(dh2, p1, DH_BYTES, s2, 50);
-  test_assert(s1len > 0);
-  test_eq(s1len, s2len);
-  test_memeq(s1, s2, s1len);
-
-  {
-    /* XXXX Now fabricate some bad values and make sure they get caught,
-     * Check 0, 1, N-1, >= N, etc.
-     */
-  }
-
- done:
-  crypto_dh_free(dh1);
-  crypto_dh_free(dh2);
-}
-
-/** Run unit tests for our random number generation function and its wrappers.
- */
-static void
-test_crypto_rng(void)
-{
-  int i, j, allok;
-  char data1[100], data2[100];
-
-  /* Try out RNG. */
-  test_assert(! crypto_seed_rng(0));
-  crypto_rand(data1, 100);
-  crypto_rand(data2, 100);
-  test_memneq(data1,data2,100);
-  allok = 1;
-  for (i = 0; i < 100; ++i) {
-    uint64_t big;
-    char *host;
-    j = crypto_rand_int(100);
-    if (i < 0 || i >= 100)
-      allok = 0;
-    big = crypto_rand_uint64(U64_LITERAL(1)<<40);
-    if (big >= (U64_LITERAL(1)<<40))
-      allok = 0;
-    big = crypto_rand_uint64(U64_LITERAL(5));
-    if (big >= 5)
-      allok = 0;
-    host = crypto_random_hostname(3,8,"www.",".onion");
-    if (strcmpstart(host,"www.") ||
-        strcmpend(host,".onion") ||
-        strlen(host) < 13 ||
-        strlen(host) > 18)
-      allok = 0;
-    tor_free(host);
-  }
-  test_assert(allok);
- done:
-  ;
-}
-
-/** Run unit tests for our AES functionality */
-static void
-test_crypto_aes(void)
-{
-  char *data1 = NULL, *data2 = NULL, *data3 = NULL;
-  crypto_cipher_env_t *env1 = NULL, *env2 = NULL;
-  int i, j;
-
-  data1 = tor_malloc(1024);
-  data2 = tor_malloc(1024);
-  data3 = tor_malloc(1024);
-
-  /* Now, test encryption and decryption with stream cipher. */
-  data1[0]='\0';
-  for (i = 1023; i>0; i -= 35)
-    strncat(data1, "Now is the time for all good onions", i);
-
-  memset(data2, 0, 1024);
-  memset(data3, 0, 1024);
-  env1 = crypto_new_cipher_env();
-  test_neq(env1, 0);
-  env2 = crypto_new_cipher_env();
-  test_neq(env2, 0);
-  j = crypto_cipher_generate_key(env1);
-  crypto_cipher_set_key(env2, crypto_cipher_get_key(env1));
-  crypto_cipher_encrypt_init_cipher(env1);
-  crypto_cipher_decrypt_init_cipher(env2);
-
-  /* Try encrypting 512 chars. */
-  crypto_cipher_encrypt(env1, data2, data1, 512);
-  crypto_cipher_decrypt(env2, data3, data2, 512);
-  test_memeq(data1, data3, 512);
-  test_memneq(data1, data2, 512);
-
-  /* Now encrypt 1 at a time, and get 1 at a time. */
-  for (j = 512; j < 560; ++j) {
-    crypto_cipher_encrypt(env1, data2+j, data1+j, 1);
-  }
-  for (j = 512; j < 560; ++j) {
-    crypto_cipher_decrypt(env2, data3+j, data2+j, 1);
-  }
-  test_memeq(data1, data3, 560);
-  /* Now encrypt 3 at a time, and get 5 at a time. */
-  for (j = 560; j < 1024-5; j += 3) {
-    crypto_cipher_encrypt(env1, data2+j, data1+j, 3);
-  }
-  for (j = 560; j < 1024-5; j += 5) {
-    crypto_cipher_decrypt(env2, data3+j, data2+j, 5);
-  }
-  test_memeq(data1, data3, 1024-5);
-  /* Now make sure that when we encrypt with different chunk sizes, we get
-     the same results. */
-  crypto_free_cipher_env(env2);
-  env2 = NULL;
-
-  memset(data3, 0, 1024);
-  env2 = crypto_new_cipher_env();
-  test_neq(env2, 0);
-  crypto_cipher_set_key(env2, crypto_cipher_get_key(env1));
-  crypto_cipher_encrypt_init_cipher(env2);
-  for (j = 0; j < 1024-16; j += 17) {
-    crypto_cipher_encrypt(env2, data3+j, data1+j, 17);
-  }
-  for (j= 0; j < 1024-16; ++j) {
-    if (data2[j] != data3[j]) {
-      printf("%d:  %d\t%d\n", j, (int) data2[j], (int) data3[j]);
-    }
-  }
-  test_memeq(data2, data3, 1024-16);
-  crypto_free_cipher_env(env1);
-  env1 = NULL;
-  crypto_free_cipher_env(env2);
-  env2 = NULL;
-
-  /* NIST test vector for aes. */
-  env1 = crypto_new_cipher_env(); /* IV starts at 0 */
-  crypto_cipher_set_key(env1, "\x80\x00\x00\x00\x00\x00\x00\x00"
-                              "\x00\x00\x00\x00\x00\x00\x00\x00");
-  crypto_cipher_encrypt_init_cipher(env1);
-  crypto_cipher_encrypt(env1, data1,
-                        "\x00\x00\x00\x00\x00\x00\x00\x00"
-                        "\x00\x00\x00\x00\x00\x00\x00\x00", 16);
-  test_memeq_hex(data1, "0EDD33D3C621E546455BD8BA1418BEC8");
-
-  /* Now test rollover.  All these values are originally from a python
-   * script. */
-  crypto_cipher_set_iv(env1, "\x00\x00\x00\x00\x00\x00\x00\x00"
-                             "\xff\xff\xff\xff\xff\xff\xff\xff");
-  memset(data2, 0,  1024);
-  crypto_cipher_encrypt(env1, data1, data2, 32);
-  test_memeq_hex(data1, "335fe6da56f843199066c14a00a40231"
-                        "cdd0b917dbc7186908a6bfb5ffd574d3");
-
-  crypto_cipher_set_iv(env1, "\x00\x00\x00\x00\xff\xff\xff\xff"
-                             "\xff\xff\xff\xff\xff\xff\xff\xff");
-  memset(data2, 0,  1024);
-  crypto_cipher_encrypt(env1, data1, data2, 32);
-  test_memeq_hex(data1, "e627c6423fa2d77832a02b2794094b73"
-                        "3e63c721df790d2c6469cc1953a3ffac");
-
-  crypto_cipher_set_iv(env1, "\xff\xff\xff\xff\xff\xff\xff\xff"
-                             "\xff\xff\xff\xff\xff\xff\xff\xff");
-  memset(data2, 0,  1024);
-  crypto_cipher_encrypt(env1, data1, data2, 32);
-  test_memeq_hex(data1, "2aed2bff0de54f9328efd070bf48f70a"
-                        "0EDD33D3C621E546455BD8BA1418BEC8");
-
-  /* Now check rollover on inplace cipher. */
-  crypto_cipher_set_iv(env1, "\xff\xff\xff\xff\xff\xff\xff\xff"
-                             "\xff\xff\xff\xff\xff\xff\xff\xff");
-  crypto_cipher_crypt_inplace(env1, data2, 64);
-  test_memeq_hex(data2, "2aed2bff0de54f9328efd070bf48f70a"
-                        "0EDD33D3C621E546455BD8BA1418BEC8"
-                        "93e2c5243d6839eac58503919192f7ae"
-                        "1908e67cafa08d508816659c2e693191");
-  crypto_cipher_set_iv(env1, "\xff\xff\xff\xff\xff\xff\xff\xff"
-                             "\xff\xff\xff\xff\xff\xff\xff\xff");
-  crypto_cipher_crypt_inplace(env1, data2, 64);
-  test_assert(tor_mem_is_zero(data2, 64));
-
- done:
-  if (env1)
-    crypto_free_cipher_env(env1);
-  if (env2)
-    crypto_free_cipher_env(env2);
-  tor_free(data1);
-  tor_free(data2);
-  tor_free(data3);
-}
-
-/** Run unit tests for our SHA-1 functionality */
-static void
-test_crypto_sha(void)
-{
-  crypto_digest_env_t *d1 = NULL, *d2 = NULL;
-  int i;
-  char key[80];
-  char digest[20];
-  char data[50];
-  char d_out1[DIGEST_LEN], d_out2[DIGEST_LEN];
-
-  /* Test SHA-1 with a test vector from the specification. */
-  i = crypto_digest(data, "abc", 3);
-  test_memeq_hex(data, "A9993E364706816ABA3E25717850C26C9CD0D89D");
-
-  /* Test HMAC-SHA-1 with test cases from RFC2202. */
-
-  /* Case 1. */
-  memset(key, 0x0b, 20);
-  crypto_hmac_sha1(digest, key, 20, "Hi There", 8);
-  test_streq(hex_str(digest, 20),
-             "B617318655057264E28BC0B6FB378C8EF146BE00");
-  /* Case 2. */
-  crypto_hmac_sha1(digest, "Jefe", 4, "what do ya want for nothing?", 28);
-  test_streq(hex_str(digest, 20),
-             "EFFCDF6AE5EB2FA2D27416D5F184DF9C259A7C79");
-
-  /* Case 4. */
-  base16_decode(key, 25,
-                "0102030405060708090a0b0c0d0e0f10111213141516171819", 50);
-  memset(data, 0xcd, 50);
-  crypto_hmac_sha1(digest, key, 25, data, 50);
-  test_streq(hex_str(digest, 20),
-             "4C9007F4026250C6BC8414F9BF50C86C2D7235DA");
-
-  /* Case . */
-  memset(key, 0xaa, 80);
-  crypto_hmac_sha1(digest, key, 80,
-                   "Test Using Larger Than Block-Size Key - Hash Key First",
-                   54);
-  test_streq(hex_str(digest, 20),
-             "AA4AE5E15272D00E95705637CE8A3B55ED402112");
-
-  /* Incremental digest code. */
-  d1 = crypto_new_digest_env();
-  test_assert(d1);
-  crypto_digest_add_bytes(d1, "abcdef", 6);
-  d2 = crypto_digest_dup(d1);
-  test_assert(d2);
-  crypto_digest_add_bytes(d2, "ghijkl", 6);
-  crypto_digest_get_digest(d2, d_out1, sizeof(d_out1));
-  crypto_digest(d_out2, "abcdefghijkl", 12);
-  test_memeq(d_out1, d_out2, DIGEST_LEN);
-  crypto_digest_assign(d2, d1);
-  crypto_digest_add_bytes(d2, "mno", 3);
-  crypto_digest_get_digest(d2, d_out1, sizeof(d_out1));
-  crypto_digest(d_out2, "abcdefmno", 9);
-  test_memeq(d_out1, d_out2, DIGEST_LEN);
-  crypto_digest_get_digest(d1, d_out1, sizeof(d_out1));
-  crypto_digest(d_out2, "abcdef", 6);
-  test_memeq(d_out1, d_out2, DIGEST_LEN);
-
- done:
-  if (d1)
-    crypto_free_digest_env(d1);
-  if (d2)
-    crypto_free_digest_env(d2);
-}
-
-/** Run unit tests for our public key crypto functions */
-static void
-test_crypto_pk(void)
-{
-  crypto_pk_env_t *pk1 = NULL, *pk2 = NULL;
-  char *encoded = NULL;
-  char data1[1024], data2[1024], data3[1024];
-  size_t size;
-  int i, j, p, len;
-
-  /* Public-key ciphers */
-  pk1 = pk_generate(0);
-  pk2 = crypto_new_pk_env();
-  test_assert(pk1 && pk2);
-  test_assert(! crypto_pk_write_public_key_to_string(pk1, &encoded, &size));
-  test_assert(! crypto_pk_read_public_key_from_string(pk2, encoded, size));
-  test_eq(0, crypto_pk_cmp_keys(pk1, pk2));
-
-  test_eq(128, crypto_pk_keysize(pk1));
-  test_eq(128, crypto_pk_keysize(pk2));
-
-  test_eq(128, crypto_pk_public_encrypt(pk2, data1, "Hello whirled.", 15,
-                                        PK_PKCS1_OAEP_PADDING));
-  test_eq(128, crypto_pk_public_encrypt(pk1, data2, "Hello whirled.", 15,
-                                        PK_PKCS1_OAEP_PADDING));
-  /* oaep padding should make encryption not match */
-  test_memneq(data1, data2, 128);
-  test_eq(15, crypto_pk_private_decrypt(pk1, data3, data1, 128,
-                                        PK_PKCS1_OAEP_PADDING,1));
-  test_streq(data3, "Hello whirled.");
-  memset(data3, 0, 1024);
-  test_eq(15, crypto_pk_private_decrypt(pk1, data3, data2, 128,
-                                        PK_PKCS1_OAEP_PADDING,1));
-  test_streq(data3, "Hello whirled.");
-  /* Can't decrypt with public key. */
-  test_eq(-1, crypto_pk_private_decrypt(pk2, data3, data2, 128,
-                                        PK_PKCS1_OAEP_PADDING,1));
-  /* Try again with bad padding */
-  memcpy(data2+1, "XYZZY", 5);  /* This has fails ~ once-in-2^40 */
-  test_eq(-1, crypto_pk_private_decrypt(pk1, data3, data2, 128,
-                                        PK_PKCS1_OAEP_PADDING,1));
-
-  /* File operations: save and load private key */
-  test_assert(! crypto_pk_write_private_key_to_filename(pk1,
-                                                        get_fname("pkey1")));
-  /* failing case for read: can't read. */
-  test_assert(crypto_pk_read_private_key_from_filename(pk2,
-                                                   get_fname("xyzzy")) < 0);
-  write_str_to_file(get_fname("xyzzy"), "foobar", 6);
-  /* Failing case for read: no key. */
-  test_assert(crypto_pk_read_private_key_from_filename(pk2,
-                                                   get_fname("xyzzy")) < 0);
-  test_assert(! crypto_pk_read_private_key_from_filename(pk2,
-                                                         get_fname("pkey1")));
-  test_eq(15, crypto_pk_private_decrypt(pk2, data3, data1, 128,
-                                        PK_PKCS1_OAEP_PADDING,1));
-
-  /* Now try signing. */
-  strlcpy(data1, "Ossifrage", 1024);
-  test_eq(128, crypto_pk_private_sign(pk1, data2, data1, 10));
-  test_eq(10, crypto_pk_public_checksig(pk1, data3, data2, 128));
-  test_streq(data3, "Ossifrage");
-  /* Try signing digests. */
-  test_eq(128, crypto_pk_private_sign_digest(pk1, data2, data1, 10));
-  test_eq(20, crypto_pk_public_checksig(pk1, data3, data2, 128));
-  test_eq(0, crypto_pk_public_checksig_digest(pk1, data1, 10, data2, 128));
-  test_eq(-1, crypto_pk_public_checksig_digest(pk1, data1, 11, data2, 128));
-  /*XXXX test failed signing*/
-
-  /* Try encoding */
-  crypto_free_pk_env(pk2);
-  pk2 = NULL;
-  i = crypto_pk_asn1_encode(pk1, data1, 1024);
-  test_assert(i>0);
-  pk2 = crypto_pk_asn1_decode(data1, i);
-  test_assert(crypto_pk_cmp_keys(pk1,pk2) == 0);
-
-  /* Try with hybrid encryption wrappers. */
-  crypto_rand(data1, 1024);
-  for (i = 0; i < 3; ++i) {
-    for (j = 85; j < 140; ++j) {
-      memset(data2,0,1024);
-      memset(data3,0,1024);
-      if (i == 0 && j < 129)
-        continue;
-      p = (i==0)?PK_NO_PADDING:
-        (i==1)?PK_PKCS1_PADDING:PK_PKCS1_OAEP_PADDING;
-      len = crypto_pk_public_hybrid_encrypt(pk1,data2,data1,j,p,0);
-      test_assert(len>=0);
-      len = crypto_pk_private_hybrid_decrypt(pk1,data3,data2,len,p,1);
-      test_eq(len,j);
-      test_memeq(data1,data3,j);
-    }
-  }
-
-  /* Try copy_full */
-  crypto_free_pk_env(pk2);
-  pk2 = crypto_pk_copy_full(pk1);
-  test_assert(pk2 != NULL);
-  test_neq_ptr(pk1, pk2);
-  test_assert(crypto_pk_cmp_keys(pk1,pk2) == 0);
-
- done:
-  if (pk1)
-    crypto_free_pk_env(pk1);
-  if (pk2)
-    crypto_free_pk_env(pk2);
-  tor_free(encoded);
-}
-
-/** Run unit tests for misc crypto functionality. */
-static void
-test_crypto(void)
-{
-  char *data1 = NULL, *data2 = NULL, *data3 = NULL;
-  int i, j, idx;
-
-  data1 = tor_malloc(1024);
-  data2 = tor_malloc(1024);
-  data3 = tor_malloc(1024);
-  test_assert(data1 && data2 && data3);
-
-  /* Base64 tests */
-  memset(data1, 6, 1024);
-  for (idx = 0; idx < 10; ++idx) {
-    i = base64_encode(data2, 1024, data1, idx);
-    test_assert(i >= 0);
-    j = base64_decode(data3, 1024, data2, i);
-    test_eq(j,idx);
-    test_memeq(data3, data1, idx);
-  }
-
-  strlcpy(data1, "Test string that contains 35 chars.", 1024);
-  strlcat(data1, " 2nd string that contains 35 chars.", 1024);
-
-  i = base64_encode(data2, 1024, data1, 71);
-  j = base64_decode(data3, 1024, data2, i);
-  test_eq(j, 71);
-  test_streq(data3, data1);
-  test_assert(data2[i] == '\0');
-
-  crypto_rand(data1, DIGEST_LEN);
-  memset(data2, 100, 1024);
-  digest_to_base64(data2, data1);
-  test_eq(BASE64_DIGEST_LEN, strlen(data2));
-  test_eq(100, data2[BASE64_DIGEST_LEN+2]);
-  memset(data3, 99, 1024);
-  test_eq(digest_from_base64(data3, data2), 0);
-  test_memeq(data1, data3, DIGEST_LEN);
-  test_eq(99, data3[DIGEST_LEN+1]);
-
-  test_assert(digest_from_base64(data3, "###") < 0);
-
-  /* Base32 tests */
-  strlcpy(data1, "5chrs", 1024);
-  /* bit pattern is:  [35 63 68 72 73] ->
-   *        [00110101 01100011 01101000 01110010 01110011]
-   * By 5s: [00110 10101 10001 10110 10000 11100 10011 10011]
-   */
-  base32_encode(data2, 9, data1, 5);
-  test_streq(data2, "gvrwq4tt");
-
-  strlcpy(data1, "\xFF\xF5\x6D\x44\xAE\x0D\x5C\xC9\x62\xC4", 1024);
-  base32_encode(data2, 30, data1, 10);
-  test_streq(data2, "772w2rfobvomsywe");
-
-  /* Base16 tests */
-  strlcpy(data1, "6chrs\xff", 1024);
-  base16_encode(data2, 13, data1, 6);
-  test_streq(data2, "3663687273FF");
-
-  strlcpy(data1, "f0d678affc000100", 1024);
-  i = base16_decode(data2, 8, data1, 16);
-  test_eq(i,0);
-  test_memeq(data2, "\xf0\xd6\x78\xaf\xfc\x00\x01\x00",8);
-
-  /* now try some failing base16 decodes */
-  test_eq(-1, base16_decode(data2, 8, data1, 15)); /* odd input len */
-  test_eq(-1, base16_decode(data2, 7, data1, 16)); /* dest too short */
-  strlcpy(data1, "f0dz!8affc000100", 1024);
-  test_eq(-1, base16_decode(data2, 8, data1, 16));
-
-  tor_free(data1);
-  tor_free(data2);
-  tor_free(data3);
-
-  /* Add spaces to fingerprint */
-  {
-    data1 = tor_strdup("ABCD1234ABCD56780000ABCD1234ABCD56780000");
-    test_eq(strlen(data1), 40);
-    data2 = tor_malloc(FINGERPRINT_LEN+1);
-    add_spaces_to_fp(data2, FINGERPRINT_LEN+1, data1);
-    test_streq(data2, "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 0000");
-    tor_free(data1);
-    tor_free(data2);
-  }
-
-  /* Check fingerprint */
-  {
-    test_assert(crypto_pk_check_fingerprint_syntax(
-                "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 0000"));
-    test_assert(!crypto_pk_check_fingerprint_syntax(
-                "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 000"));
-    test_assert(!crypto_pk_check_fingerprint_syntax(
-                "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 00000"));
-    test_assert(!crypto_pk_check_fingerprint_syntax(
-                "ABCD 1234 ABCD 5678 0000 ABCD1234 ABCD 5678 0000"));
-    test_assert(!crypto_pk_check_fingerprint_syntax(
-                "ABCD 1234 ABCD 5678 0000 ABCD1234 ABCD 5678 00000"));
-    test_assert(!crypto_pk_check_fingerprint_syntax(
-                "ACD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 00000"));
-  }
-
- done:
-  tor_free(data1);
-  tor_free(data2);
-  tor_free(data3);
-}
-
-/** Run unit tests for our secret-to-key passphrase hashing functionality. */
-static void
-test_crypto_s2k(void)
-{
-  char buf[29];
-  char buf2[29];
-  char *buf3 = NULL;
-  int i;
-
-  memset(buf, 0, sizeof(buf));
-  memset(buf2, 0, sizeof(buf2));
-  buf3 = tor_malloc(65536);
-  memset(buf3, 0, 65536);
-
-  secret_to_key(buf+9, 20, "", 0, buf);
-  crypto_digest(buf2+9, buf3, 1024);
-  test_memeq(buf, buf2, 29);
-
-  memcpy(buf,"vrbacrda",8);
-  memcpy(buf2,"vrbacrda",8);
-  buf[8] = 96;
-  buf2[8] = 96;
-  secret_to_key(buf+9, 20, "12345678", 8, buf);
-  for (i = 0; i < 65536; i += 16) {
-    memcpy(buf3+i, "vrbacrda12345678", 16);
-  }
-  crypto_digest(buf2+9, buf3, 65536);
-  test_memeq(buf, buf2, 29);
-
- done:
-  tor_free(buf3);
-}
-
-/** Helper: return a tristate based on comparing the strings in *<b>a</b> and
- * *<b>b</b>. */
-static int
-_compare_strs(const void **a, const void **b)
-{
-  const char *s1 = *a, *s2 = *b;
-  return strcmp(s1, s2);
-}
-
-/** Helper: return a tristate based on comparing the strings in *<b>a</b> and
- * *<b>b</b>, excluding a's first character, and ignoring case. */
-static int
-_compare_without_first_ch(const void *a, const void **b)
-{
-  const char *s1 = a, *s2 = *b;
-  return strcasecmp(s1+1, s2);
-}
-
-/** Test basic utility functionality. */
-static void
-test_util(void)
-{
-  struct timeval start, end;
-  struct tm a_time;
-  char timestr[RFC1123_TIME_LEN+1];
-  char buf[1024];
-  time_t t_res;
-  int i;
-  uint32_t u32;
-  uint16_t u16;
-  char *cp, *k, *v;
-  const char *str;
-
-  start.tv_sec = 5;
-  start.tv_usec = 5000;
-
-  end.tv_sec = 5;
-  end.tv_usec = 5000;
-
-  test_eq(0L, tv_udiff(&start, &end));
-
-  end.tv_usec = 7000;
-
-  test_eq(2000L, tv_udiff(&start, &end));
-
-  end.tv_sec = 6;
-
-  test_eq(1002000L, tv_udiff(&start, &end));
-
-  end.tv_usec = 0;
-
-  test_eq(995000L, tv_udiff(&start, &end));
-
-  end.tv_sec = 4;
-
-  test_eq(-1005000L, tv_udiff(&start, &end));
-
-  end.tv_usec = 999990;
-  start.tv_sec = 1;
-  start.tv_usec = 500;
-
-  /* The test values here are confirmed to be correct on a platform
-   * with a working timegm. */
-  a_time.tm_year = 2003-1900;
-  a_time.tm_mon = 7;
-  a_time.tm_mday = 30;
-  a_time.tm_hour = 6;
-  a_time.tm_min = 14;
-  a_time.tm_sec = 55;
-  test_eq((time_t) 1062224095UL, tor_timegm(&a_time));
-  a_time.tm_year = 2004-1900; /* Try a leap year, after feb. */
-  test_eq((time_t) 1093846495UL, tor_timegm(&a_time));
-  a_time.tm_mon = 1;          /* Try a leap year, in feb. */
-  a_time.tm_mday = 10;
-  test_eq((time_t) 1076393695UL, tor_timegm(&a_time));
-
-  format_rfc1123_time(timestr, 0);
-  test_streq("Thu, 01 Jan 1970 00:00:00 GMT", timestr);
-  format_rfc1123_time(timestr, (time_t)1091580502UL);
-  test_streq("Wed, 04 Aug 2004 00:48:22 GMT", timestr);
-
-  t_res = 0;
-  i = parse_rfc1123_time(timestr, &t_res);
-  test_eq(i,0);
-  test_eq(t_res, (time_t)1091580502UL);
-  test_eq(-1, parse_rfc1123_time("Wed, zz Aug 2004 99-99x99 GMT", &t_res));
-  tor_gettimeofday(&start);
-
-  /* Tests for corner cases of strl operations */
-  test_eq(5, strlcpy(buf, "Hello", 0));
-  strlcpy(buf, "Hello", sizeof(buf));
-  test_eq(10, strlcat(buf, "Hello", 5));
-
-  /* Test tor_strstrip() */
-  strlcpy(buf, "Testing 1 2 3", sizeof(buf));
-  tor_strstrip(buf, ",!");
-  test_streq(buf, "Testing 1 2 3");
-  strlcpy(buf, "!Testing 1 2 3?", sizeof(buf));
-  tor_strstrip(buf, "!? ");
-  test_streq(buf, "Testing123");
-
-  /* Test parse_addr_port */
-  cp = NULL; u32 = 3; u16 = 3;
-  test_assert(!parse_addr_port(LOG_WARN, "1.2.3.4", &cp, &u32, &u16));
-  test_streq(cp, "1.2.3.4");
-  test_eq(u32, 0x01020304u);
-  test_eq(u16, 0);
-  tor_free(cp);
-  test_assert(!parse_addr_port(LOG_WARN, "4.3.2.1:99", &cp, &u32, &u16));
-  test_streq(cp, "4.3.2.1");
-  test_eq(u32, 0x04030201u);
-  test_eq(u16, 99);
-  tor_free(cp);
-  test_assert(!parse_addr_port(LOG_WARN, "nonexistent.address:4040",
-                               &cp, NULL, &u16));
-  test_streq(cp, "nonexistent.address");
-  test_eq(u16, 4040);
-  tor_free(cp);
-  test_assert(!parse_addr_port(LOG_WARN, "localhost:9999", &cp, &u32, &u16));
-  test_streq(cp, "localhost");
-  test_eq(u32, 0x7f000001u);
-  test_eq(u16, 9999);
-  tor_free(cp);
-  u32 = 3;
-  test_assert(!parse_addr_port(LOG_WARN, "localhost", NULL, &u32, &u16));
-  test_eq(cp, NULL);
-  test_eq(u32, 0x7f000001u);
-  test_eq(u16, 0);
-  tor_free(cp);
-  test_eq(0, addr_mask_get_bits(0x0u));
-  test_eq(32, addr_mask_get_bits(0xFFFFFFFFu));
-  test_eq(16, addr_mask_get_bits(0xFFFF0000u));
-  test_eq(31, addr_mask_get_bits(0xFFFFFFFEu));
-  test_eq(1, addr_mask_get_bits(0x80000000u));
-
-  /* Test tor_parse_long. */
-  test_eq(10L, tor_parse_long("10",10,0,100,NULL,NULL));
-  test_eq(0L, tor_parse_long("10",10,50,100,NULL,NULL));
-  test_eq(-50L, tor_parse_long("-50",10,-100,100,NULL,NULL));
-
-  /* Test tor_parse_ulong */
-  test_eq(10UL, tor_parse_ulong("10",10,0,100,NULL,NULL));
-  test_eq(0UL, tor_parse_ulong("10",10,50,100,NULL,NULL));
-
-  /* Test tor_parse_uint64. */
-  test_assert(U64_LITERAL(10) == tor_parse_uint64("10 x",10,0,100, &i, &cp));
-  test_assert(i == 1);
-  test_streq(cp, " x");
-  test_assert(U64_LITERAL(12345678901) ==
-              tor_parse_uint64("12345678901",10,0,UINT64_MAX, &i, &cp));
-  test_assert(i == 1);
-  test_streq(cp, "");
-  test_assert(U64_LITERAL(0) ==
-              tor_parse_uint64("12345678901",10,500,INT32_MAX, &i, &cp));
-  test_assert(i == 0);
-
-  /* Test failing snprintf cases */
-  test_eq(-1, tor_snprintf(buf, 0, "Foo"));
-  test_eq(-1, tor_snprintf(buf, 2, "Foo"));
-
-  /* Test printf with uint64 */
-  tor_snprintf(buf, sizeof(buf), "x!"U64_FORMAT"!x",
-               U64_PRINTF_ARG(U64_LITERAL(12345678901)));
-  test_streq(buf, "x!12345678901!x");
-
-  /* Test parse_config_line_from_str */
-  strlcpy(buf, "k v\n" " key    value with spaces   \n" "keykey val\n"
-          "k2\n"
-          "k3 \n" "\n" "   \n" "#comment\n"
-          "k4#a\n" "k5#abc\n" "k6 val #with comment\n"
-          "kseven   \"a quoted 'string\"\n"
-          "k8 \"a \\x71uoted\\n\\\"str\\\\ing\\t\\001\\01\\1\\\"\"\n"
-          , sizeof(buf));
-  str = buf;
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "k");
-  test_streq(v, "v");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "key    value with"));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "key");
-  test_streq(v, "value with spaces");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "keykey"));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "keykey");
-  test_streq(v, "val");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "k2\n"));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "k2");
-  test_streq(v, "");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "k3 \n"));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "k3");
-  test_streq(v, "");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "#comment"));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "k4");
-  test_streq(v, "");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "k5#abc"));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "k5");
-  test_streq(v, "");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "k6"));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "k6");
-  test_streq(v, "val");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "kseven"));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "kseven");
-  test_streq(v, "a quoted \'string");
-  tor_free(k); tor_free(v);
-  test_assert(!strcmpstart(str, "k8 "));
-
-  str = parse_config_line_from_str(str, &k, &v);
-  test_streq(k, "k8");
-  test_streq(v, "a quoted\n\"str\\ing\t\x01\x01\x01\"");
-  tor_free(k); tor_free(v);
-  test_streq(str, "");
-
-  /* Test for strcmpstart and strcmpend. */
-  test_assert(strcmpstart("abcdef", "abcdef")==0);
-  test_assert(strcmpstart("abcdef", "abc")==0);
-  test_assert(strcmpstart("abcdef", "abd")<0);
-  test_assert(strcmpstart("abcdef", "abb")>0);
-  test_assert(strcmpstart("ab", "abb")<0);
-
-  test_assert(strcmpend("abcdef", "abcdef")==0);
-  test_assert(strcmpend("abcdef", "def")==0);
-  test_assert(strcmpend("abcdef", "deg")<0);
-  test_assert(strcmpend("abcdef", "dee")>0);
-  test_assert(strcmpend("ab", "abb")<0);
-
-  test_assert(strcasecmpend("AbcDEF", "abcdef")==0);
-  test_assert(strcasecmpend("abcdef", "dEF")==0);
-  test_assert(strcasecmpend("abcDEf", "deg")<0);
-  test_assert(strcasecmpend("abcdef", "DEE")>0);
-  test_assert(strcasecmpend("ab", "abB")<0);
-
-  /* Test mem_is_zero */
-  memset(buf,0,128);
-  buf[128] = 'x';
-  test_assert(tor_digest_is_zero(buf));
-  test_assert(tor_mem_is_zero(buf, 10));
-  test_assert(tor_mem_is_zero(buf, 20));
-  test_assert(tor_mem_is_zero(buf, 128));
-  test_assert(!tor_mem_is_zero(buf, 129));
-  buf[60] = (char)255;
-  test_assert(!tor_mem_is_zero(buf, 128));
-  buf[0] = (char)1;
-  test_assert(!tor_mem_is_zero(buf, 10));
-
-  /* Test inet_ntop */
-  {
-    char tmpbuf[TOR_ADDR_BUF_LEN];
-    const char *ip = "176.192.208.224";
-    struct in_addr in;
-    tor_inet_pton(AF_INET, ip, &in);
-    tor_inet_ntop(AF_INET, &in, tmpbuf, sizeof(tmpbuf));
-    test_streq(tmpbuf, ip);
-  }
-
-  /* Test 'escaped' */
-  test_streq("\"\"", escaped(""));
-  test_streq("\"abcd\"", escaped("abcd"));
-  test_streq("\"\\\\\\n\\r\\t\\\"\\'\"", escaped("\\\n\r\t\"\'"));
-  test_streq("\"z\\001abc\\277d\"", escaped("z\001abc\277d"));
-  test_assert(NULL == escaped(NULL));
-
-  /* Test strndup and memdup */
-  {
-    const char *s = "abcdefghijklmnopqrstuvwxyz";
-    cp = tor_strndup(s, 30);
-    test_streq(cp, s); /* same string, */
-    test_neq(cp, s); /* but different pointers. */
-    tor_free(cp);
-
-    cp = tor_strndup(s, 5);
-    test_streq(cp, "abcde");
-    tor_free(cp);
-
-    s = "a\0b\0c\0d\0e\0";
-    cp = tor_memdup(s,10);
-    test_memeq(cp, s, 10); /* same ram, */
-    test_neq(cp, s); /* but different pointers. */
-    tor_free(cp);
-  }
-
-  /* Test str-foo functions */
-  cp = tor_strdup("abcdef");
-  test_assert(tor_strisnonupper(cp));
-  cp[3] = 'D';
-  test_assert(!tor_strisnonupper(cp));
-  tor_strupper(cp);
-  test_streq(cp, "ABCDEF");
-  test_assert(tor_strisprint(cp));
-  cp[3] = 3;
-  test_assert(!tor_strisprint(cp));
-  tor_free(cp);
-
-  /* Test eat_whitespace. */
-  {
-    const char *s = "  \n a";
-    test_eq_ptr(eat_whitespace(s), s+4);
-    s = "abcd";
-    test_eq_ptr(eat_whitespace(s), s);
-    s = "#xyz\nab";
-    test_eq_ptr(eat_whitespace(s), s+5);
-  }
-
-  /* Test memmem and memstr */
-  {
-    const char *haystack = "abcde";
-    tor_assert(!tor_memmem(haystack, 5, "ef", 2));
-    test_eq_ptr(tor_memmem(haystack, 5, "cd", 2), haystack + 2);
-    test_eq_ptr(tor_memmem(haystack, 5, "cde", 3), haystack + 2);
-    haystack = "ababcad";
-    test_eq_ptr(tor_memmem(haystack, 7, "abc", 3), haystack + 2);
-    test_eq_ptr(tor_memstr(haystack, 7, "abc"), haystack + 2);
-    test_assert(!tor_memstr(haystack, 7, "fe"));
-    test_assert(!tor_memstr(haystack, 7, "longerthantheoriginal"));
-  }
-
-  /* Test wrap_string */
-  {
-    smartlist_t *sl = smartlist_create();
-    wrap_string(sl, "This is a test of string wrapping functionality: woot.",
-                10, "", "");
-    cp = smartlist_join_strings(sl, "", 0, NULL);
-    test_streq(cp,
-            "This is a\ntest of\nstring\nwrapping\nfunctional\nity: woot.\n");
-    tor_free(cp);
-    SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-    smartlist_clear(sl);
-
-    wrap_string(sl, "This is a test of string wrapping functionality: woot.",
-                16, "### ", "# ");
-    cp = smartlist_join_strings(sl, "", 0, NULL);
-    test_streq(cp,
-             "### This is a\n# test of string\n# wrapping\n# functionality:\n"
-             "# woot.\n");
-
-    tor_free(cp);
-    SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-    smartlist_free(sl);
-  }
-
-  /* now make sure time works. */
-  tor_gettimeofday(&end);
-  /* We might've timewarped a little. */
-  test_assert(tv_udiff(&start, &end) >= -5000);
-
-  /* Test tor_log2(). */
-  test_eq(tor_log2(64), 6);
-  test_eq(tor_log2(65), 6);
-  test_eq(tor_log2(63), 5);
-  test_eq(tor_log2(1), 0);
-  test_eq(tor_log2(2), 1);
-  test_eq(tor_log2(3), 1);
-  test_eq(tor_log2(4), 2);
-  test_eq(tor_log2(5), 2);
-  test_eq(tor_log2(U64_LITERAL(40000000000000000)), 55);
-  test_eq(tor_log2(UINT64_MAX), 63);
-
-  /* Test round_to_power_of_2 */
-  test_eq(round_to_power_of_2(120), 128);
-  test_eq(round_to_power_of_2(128), 128);
-  test_eq(round_to_power_of_2(130), 128);
-  test_eq(round_to_power_of_2(U64_LITERAL(40000000000000000)),
-          U64_LITERAL(1)<<55);
-  test_eq(round_to_power_of_2(0), 2);
-
- done:
-  ;
-}
-
-/** Helper: assert that IPv6 addresses <b>a</b> and <b>b</b> are the same.  On
- * failure, reports an error, describing the addresses as <b>e1</b> and
- * <b>e2</b>, and reporting the line number as <b>line</b>. */
-static void
-_test_eq_ip6(struct in6_addr *a, struct in6_addr *b, const char *e1,
-             const char *e2, int line)
-{
-  int i;
-  int ok = 1;
-  for (i = 0; i < 16; ++i) {
-    if (a->s6_addr[i] != b->s6_addr[i]) {
-      ok = 0;
-      break;
-    }
-  }
-  if (ok) {
-    printf("."); fflush(stdout);
-  } else {
-    char buf1[128], *cp1;
-    char buf2[128], *cp2;
-    have_failed = 1;
-    cp1 = buf1; cp2 = buf2;
-    for (i=0; i<16; ++i) {
-      tor_snprintf(cp1, sizeof(buf1)-(cp1-buf1), "%02x", a->s6_addr[i]);
-      tor_snprintf(cp2, sizeof(buf2)-(cp2-buf2), "%02x", b->s6_addr[i]);
-      cp1 += 2; cp2 += 2;
-      if ((i%2)==1 && i != 15) {
-        *cp1++ = ':';
-        *cp2++ = ':';
-      }
-    }
-    *cp1 = *cp2 = '\0';
-    printf("Line %d: assertion failed: (%s == %s)\n"
-           "      %s != %s\n", line, e1, e2, buf1, buf2);
-    fflush(stdout);
-  }
-}
-
-/** Helper: Assert that two strings both decode as IPv6 addresses with
- * tor_inet_pton(), and both decode to the same address. */
-#define test_pton6_same(a,b) STMT_BEGIN                \
-     test_eq(tor_inet_pton(AF_INET6, a, &a1), 1);      \
-     test_eq(tor_inet_pton(AF_INET6, b, &a2), 1);      \
-    _test_eq_ip6(&a1,&a2,#a,#b,__LINE__);              \
-  STMT_END
-
-/** Helper: Assert that <b>a</b> is recognized as a bad IPv6 address by
- * tor_inet_pton(). */
-#define test_pton6_bad(a)                       \
-  test_eq(0, tor_inet_pton(AF_INET6, a, &a1))
-
-/** Helper: assert that <b>a</b>, when parsed by tor_inet_pton() and displayed
- * with tor_inet_ntop(), yields <b>b</b>. Also assert that <b>b</b> parses to
- * the same value as <b>a</b>. */
-#define test_ntop6_reduces(a,b) STMT_BEGIN                              \
-    test_eq(tor_inet_pton(AF_INET6, a, &a1), 1);                        \
-    test_streq(tor_inet_ntop(AF_INET6, &a1, buf, sizeof(buf)), b);      \
-    test_eq(tor_inet_pton(AF_INET6, b, &a2), 1);                        \
-    _test_eq_ip6(&a1, &a2, a, b, __LINE__);                             \
-  STMT_END
-
-/** Helper: assert that <b>a</b> parses by tor_inet_pton() into a address that
- * passes tor_addr_is_internal() with <b>for_listening</b>. */
-#define test_internal_ip(a,for_listening) STMT_BEGIN           \
-    test_eq(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), 1); \
-    t1.family = AF_INET6;                                      \
-    if (!tor_addr_is_internal(&t1, for_listening))             \
-      test_fail_msg( a "was not internal.");                   \
-  STMT_END
-
-/** Helper: assert that <b>a</b> parses by tor_inet_pton() into a address that
- * does not pass tor_addr_is_internal() with <b>for_listening</b>. */
-#define test_external_ip(a,for_listening) STMT_BEGIN           \
-    test_eq(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), 1); \
-    t1.family = AF_INET6;                                      \
-    if (tor_addr_is_internal(&t1, for_listening))              \
-      test_fail_msg(a  "was not external.");                   \
-  STMT_END
-
-/** Helper: Assert that <b>a</b> and <b>b</b>, when parsed by
- * tor_inet_pton(), give addresses that compare in the order defined by
- * <b>op</b> with tor_addr_compare(). */
-#define test_addr_compare(a, op, b) STMT_BEGIN                    \
-    test_eq(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), 1);    \
-    test_eq(tor_inet_pton(AF_INET6, b, &t2.addr.in6_addr), 1);    \
-    t1.family = t2.family = AF_INET6;                             \
-    r = tor_addr_compare(&t1,&t2,CMP_SEMANTIC);                   \
-    if (!(r op 0))                                                \
-      test_fail_msg("failed: tor_addr_compare("a","b") "#op" 0"); \
-  STMT_END
-
-/** Helper: Assert that <b>a</b> and <b>b</b>, when parsed by
- * tor_inet_pton(), give addresses that compare in the order defined by
- * <b>op</b> with tor_addr_compare_masked() with <b>m</b> masked. */
-#define test_addr_compare_masked(a, op, b, m) STMT_BEGIN          \
-    test_eq(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), 1);    \
-    test_eq(tor_inet_pton(AF_INET6, b, &t2.addr.in6_addr), 1);    \
-    t1.family = t2.family = AF_INET6;                             \
-    r = tor_addr_compare_masked(&t1,&t2,m,CMP_SEMANTIC);          \
-    if (!(r op 0))                                                \
-      test_fail_msg("failed: tor_addr_compare_masked("a","b","#m") "#op" 0"); \
-  STMT_END
-
-/** Helper: assert that <b>xx</b> is parseable as a masked IPv6 address with
- * ports by tor_parse_mask_addr_ports(), with family <b>f</b>, IP address
- * as 4 32-bit words <b>ip1...ip4</b>, mask bits as <b>mm</b>, and port range
- * as <b>pt1..pt2</b>. */
-#define test_addr_mask_ports_parse(xx, f, ip1, ip2, ip3, ip4, mm, pt1, pt2) \
-  STMT_BEGIN                                                                \
-    test_eq(tor_addr_parse_mask_ports(xx, &t1, &mask, &port1, &port2), f);  \
-    p1=tor_inet_ntop(AF_INET6, &t1.addr.in6_addr, bug, sizeof(bug));        \
-    test_eq(htonl(ip1), tor_addr_to_in6_addr32(&t1)[0]);            \
-    test_eq(htonl(ip2), tor_addr_to_in6_addr32(&t1)[1]);            \
-    test_eq(htonl(ip3), tor_addr_to_in6_addr32(&t1)[2]);            \
-    test_eq(htonl(ip4), tor_addr_to_in6_addr32(&t1)[3]);            \
-    test_eq(mask, mm);                                     \
-    test_eq(port1, pt1);                                   \
-    test_eq(port2, pt2);                                   \
-  STMT_END
-
-/** Run unit tests for IPv6 encoding/decoding/manipulation functions. */
-static void
-test_util_ip6_helpers(void)
-{
-  char buf[TOR_ADDR_BUF_LEN], bug[TOR_ADDR_BUF_LEN];
-  struct in6_addr a1, a2;
-  tor_addr_t t1, t2;
-  int r, i;
-  uint16_t port1, port2;
-  maskbits_t mask;
-  const char *p1;
-  struct sockaddr_storage sa_storage;
-  struct sockaddr_in *sin;
-  struct sockaddr_in6 *sin6;
-
-  //  struct in_addr b1, b2;
-  /* Test tor_inet_ntop and tor_inet_pton: IPv6 */
-
-  /* ==== Converting to and from sockaddr_t. */
-  sin = (struct sockaddr_in *)&sa_storage;
-  sin->sin_family = AF_INET;
-  sin->sin_port = 9090;
-  sin->sin_addr.s_addr = htonl(0x7f7f0102); /*127.127.1.2*/
-  tor_addr_from_sockaddr(&t1, (struct sockaddr *)sin, NULL);
-  test_eq(tor_addr_family(&t1), AF_INET);
-  test_eq(tor_addr_to_ipv4h(&t1), 0x7f7f0102);
-
-  memset(&sa_storage, 0, sizeof(sa_storage));
-  test_eq(sizeof(struct sockaddr_in),
-          tor_addr_to_sockaddr(&t1, 1234, (struct sockaddr *)&sa_storage,
-                               sizeof(sa_storage)));
-  test_eq(1234, ntohs(sin->sin_port));
-  test_eq(0x7f7f0102, ntohl(sin->sin_addr.s_addr));
-
-  memset(&sa_storage, 0, sizeof(sa_storage));
-  sin6 = (struct sockaddr_in6 *)&sa_storage;
-  sin6->sin6_family = AF_INET6;
-  sin6->sin6_port = htons(7070);
-  sin6->sin6_addr.s6_addr[0] = 128;
-  tor_addr_from_sockaddr(&t1, (struct sockaddr *)sin6, NULL);
-  test_eq(tor_addr_family(&t1), AF_INET6);
-  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 0);
-  test_streq(p1, "8000::");
-
-  memset(&sa_storage, 0, sizeof(sa_storage));
-  test_eq(sizeof(struct sockaddr_in6),
-          tor_addr_to_sockaddr(&t1, 9999, (struct sockaddr *)&sa_storage,
-                               sizeof(sa_storage)));
-  test_eq(AF_INET6, sin6->sin6_family);
-  test_eq(9999, ntohs(sin6->sin6_port));
-  test_eq(0x80000000, ntohl(S6_ADDR32(sin6->sin6_addr)[0]));
-
-  /* ==== tor_addr_lookup: static cases.  (Can't test dns without knowing we
-   * have a good resolver. */
-  test_eq(0, tor_addr_lookup("127.128.129.130", AF_UNSPEC, &t1));
-  test_eq(AF_INET, tor_addr_family(&t1));
-  test_eq(tor_addr_to_ipv4h(&t1), 0x7f808182);
-
-  test_eq(0, tor_addr_lookup("9000::5", AF_UNSPEC, &t1));
-  test_eq(AF_INET6, tor_addr_family(&t1));
-  test_eq(0x90, tor_addr_to_in6_addr8(&t1)[0]);
-  test_assert(tor_mem_is_zero((char*)tor_addr_to_in6_addr8(&t1)+1, 14));
-  test_eq(0x05, tor_addr_to_in6_addr8(&t1)[15]);
-
-  /* === Test pton: valid af_inet6 */
-  /* Simple, valid parsing. */
-  r = tor_inet_pton(AF_INET6,
-                    "0102:0304:0506:0708:090A:0B0C:0D0E:0F10", &a1);
-  test_assert(r==1);
-  for (i=0;i<16;++i) { test_eq(i+1, (int)a1.s6_addr[i]); }
-  /* ipv4 ending. */
-  test_pton6_same("0102:0304:0506:0708:090A:0B0C:0D0E:0F10",
-                  "0102:0304:0506:0708:090A:0B0C:13.14.15.16");
-  /* shortened words. */
-  test_pton6_same("0001:0099:BEEF:0000:0123:FFFF:0001:0001",
-                  "1:99:BEEF:0:0123:FFFF:1:1");
-  /* zeros at the beginning */
-  test_pton6_same("0000:0000:0000:0000:0009:C0A8:0001:0001",
-                  "::9:c0a8:1:1");
-  test_pton6_same("0000:0000:0000:0000:0009:C0A8:0001:0001",
-                  "::9:c0a8:0.1.0.1");
-  /* zeros in the middle. */
-  test_pton6_same("fe80:0000:0000:0000:0202:1111:0001:0001",
-                  "fe80::202:1111:1:1");
-  /* zeros at the end. */
-  test_pton6_same("1000:0001:0000:0007:0000:0000:0000:0000",
-                  "1000:1:0:7::");
-
-  /* === Test ntop: af_inet6 */
-  test_ntop6_reduces("0:0:0:0:0:0:0:0", "::");
-
-  test_ntop6_reduces("0001:0099:BEEF:0006:0123:FFFF:0001:0001",
-                     "1:99:beef:6:123:ffff:1:1");
-
-  //test_ntop6_reduces("0:0:0:0:0:0:c0a8:0101", "::192.168.1.1");
-  test_ntop6_reduces("0:0:0:0:0:ffff:c0a8:0101", "::ffff:192.168.1.1");
-  test_ntop6_reduces("002:0:0000:0:3::4", "2::3:0:0:4");
-  test_ntop6_reduces("0:0::1:0:3", "::1:0:3");
-  test_ntop6_reduces("008:0::0", "8::");
-  test_ntop6_reduces("0:0:0:0:0:ffff::1", "::ffff:0.0.0.1");
-  test_ntop6_reduces("abcd:0:0:0:0:0:7f00::", "abcd::7f00:0");
-  test_ntop6_reduces("0000:0000:0000:0000:0009:C0A8:0001:0001",
-                     "::9:c0a8:1:1");
-  test_ntop6_reduces("fe80:0000:0000:0000:0202:1111:0001:0001",
-                     "fe80::202:1111:1:1");
-  test_ntop6_reduces("1000:0001:0000:0007:0000:0000:0000:0000",
-                     "1000:1:0:7::");
-
-  /* === Test pton: invalid in6. */
-  test_pton6_bad("foobar.");
-  test_pton6_bad("55555::");
-  test_pton6_bad("9:-60::");
-  test_pton6_bad("1:2:33333:4:0002:3::");
-  //test_pton6_bad("1:2:3333:4:00002:3::");// BAD, but glibc doesn't say so.
-  test_pton6_bad("1:2:3333:4:fish:3::");
-  test_pton6_bad("1:2:3:4:5:6:7:8:9");
-  test_pton6_bad("1:2:3:4:5:6:7");
-  test_pton6_bad("1:2:3:4:5:6:1.2.3.4.5");
-  test_pton6_bad("1:2:3:4:5:6:1.2.3");
-  test_pton6_bad("::1.2.3");
-  test_pton6_bad("::1.2.3.4.5");
-  test_pton6_bad("99");
-  test_pton6_bad("");
-  test_pton6_bad("1::2::3:4");
-  test_pton6_bad("a:::b:c");
-  test_pton6_bad(":::a:b:c");
-  test_pton6_bad("a:b:c:::");
-
-  /* test internal checking */
-  test_external_ip("fbff:ffff::2:7", 0);
-  test_internal_ip("fc01::2:7", 0);
-  test_internal_ip("fdff:ffff::f:f", 0);
-  test_external_ip("fe00::3:f", 0);
-
-  test_external_ip("fe7f:ffff::2:7", 0);
-  test_internal_ip("fe80::2:7", 0);
-  test_internal_ip("febf:ffff::f:f", 0);
-
-  test_internal_ip("fec0::2:7:7", 0);
-  test_internal_ip("feff:ffff::e:7:7", 0);
-  test_external_ip("ff00::e:7:7", 0);
-
-  test_internal_ip("::", 0);
-  test_internal_ip("::1", 0);
-  test_internal_ip("::1", 1);
-  test_internal_ip("::", 0);
-  test_external_ip("::", 1);
-  test_external_ip("::2", 0);
-  test_external_ip("2001::", 0);
-  test_external_ip("ffff::", 0);
-
-  test_external_ip("::ffff:0.0.0.0", 1);
-  test_internal_ip("::ffff:0.0.0.0", 0);
-  test_internal_ip("::ffff:0.255.255.255", 0);
-  test_external_ip("::ffff:1.0.0.0", 0);
-
-  test_external_ip("::ffff:9.255.255.255", 0);
-  test_internal_ip("::ffff:10.0.0.0", 0);
-  test_internal_ip("::ffff:10.255.255.255", 0);
-  test_external_ip("::ffff:11.0.0.0", 0);
-
-  test_external_ip("::ffff:126.255.255.255", 0);
-  test_internal_ip("::ffff:127.0.0.0", 0);
-  test_internal_ip("::ffff:127.255.255.255", 0);
-  test_external_ip("::ffff:128.0.0.0", 0);
-
-  test_external_ip("::ffff:172.15.255.255", 0);
-  test_internal_ip("::ffff:172.16.0.0", 0);
-  test_internal_ip("::ffff:172.31.255.255", 0);
-  test_external_ip("::ffff:172.32.0.0", 0);
-
-  test_external_ip("::ffff:192.167.255.255", 0);
-  test_internal_ip("::ffff:192.168.0.0", 0);
-  test_internal_ip("::ffff:192.168.255.255", 0);
-  test_external_ip("::ffff:192.169.0.0", 0);
-
-  test_external_ip("::ffff:169.253.255.255", 0);
-  test_internal_ip("::ffff:169.254.0.0", 0);
-  test_internal_ip("::ffff:169.254.255.255", 0);
-  test_external_ip("::ffff:169.255.0.0", 0);
-  test_assert(is_internal_IP(0x7f000001, 0));
-
-  /* tor_addr_compare(tor_addr_t x2) */
-  test_addr_compare("ffff::", ==, "ffff::0");
-  test_addr_compare("0::3:2:1", <, "0::ffff:0.3.2.1");
-  test_addr_compare("0::2:2:1", <, "0::ffff:0.3.2.1");
-  test_addr_compare("0::ffff:0.3.2.1", >, "0::0:0:0");
-  test_addr_compare("0::ffff:5.2.2.1", <, "::ffff:6.0.0.0"); /* XXXX wrong. */
-  tor_addr_parse_mask_ports("[::ffff:2.3.4.5]", &t1, NULL, NULL, NULL);
-  tor_addr_parse_mask_ports("2.3.4.5", &t2, NULL, NULL, NULL);
-  test_assert(tor_addr_compare(&t1, &t2, CMP_SEMANTIC) == 0);
-  tor_addr_parse_mask_ports("[::ffff:2.3.4.4]", &t1, NULL, NULL, NULL);
-  tor_addr_parse_mask_ports("2.3.4.5", &t2, NULL, NULL, NULL);
-  test_assert(tor_addr_compare(&t1, &t2, CMP_SEMANTIC) < 0);
-
-  /* test compare_masked */
-  test_addr_compare_masked("ffff::", ==, "ffff::0", 128);
-  test_addr_compare_masked("ffff::", ==, "ffff::0", 64);
-  test_addr_compare_masked("0::2:2:1", <, "0::8000:2:1", 81);
-  test_addr_compare_masked("0::2:2:1", ==, "0::8000:2:1", 80);
-
-  /* Test decorated addr_to_string. */
-  test_eq(AF_INET6, tor_addr_from_str(&t1, "[123:45:6789::5005:11]"));
-  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);
-  test_streq(p1, "[123:45:6789::5005:11]");
-  test_eq(AF_INET, tor_addr_from_str(&t1, "18.0.0.1"));
-  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);
-  test_streq(p1, "18.0.0.1");
-
-  /* Test tor_addr_parse_reverse_lookup_name */
-  i = tor_addr_parse_reverse_lookup_name(&t1, "Foobar.baz", AF_UNSPEC, 0);
-  test_eq(0, i);
-  i = tor_addr_parse_reverse_lookup_name(&t1, "Foobar.baz", AF_UNSPEC, 1);
-  test_eq(0, i);
-  i = tor_addr_parse_reverse_lookup_name(&t1, "1.0.168.192.in-addr.arpa",
-                                         AF_UNSPEC, 1);
-  test_eq(1, i);
-  test_eq(tor_addr_family(&t1), AF_INET);
-  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);
-  test_streq(p1, "192.168.0.1");
-  i = tor_addr_parse_reverse_lookup_name(&t1, "192.168.0.99", AF_UNSPEC, 0);
-  test_eq(0, i);
-  i = tor_addr_parse_reverse_lookup_name(&t1, "192.168.0.99", AF_UNSPEC, 1);
-  test_eq(1, i);
-  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);
-  test_streq(p1, "192.168.0.99");
-  memset(&t1, 0, sizeof(t1));
-  i = tor_addr_parse_reverse_lookup_name(&t1,
-                                         "0.1.2.3.4.5.6.7.8.9.a.b.c.d.e.f."
-                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."
-                                         "ip6.ARPA",
-                                         AF_UNSPEC, 0);
-  test_eq(1, i);
-  p1 = tor_addr_to_str(buf, &t1, sizeof(buf), 1);
-  test_streq(p1, "[9dee:effe:ebe1:beef:fedc:ba98:7654:3210]");
-  /* Failing cases. */
-  i = tor_addr_parse_reverse_lookup_name(&t1,
-                                         "6.7.8.9.a.b.c.d.e.f."
-                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."
-                                         "ip6.ARPA",
-                                         AF_UNSPEC, 0);
-  test_eq(i, -1);
-  i = tor_addr_parse_reverse_lookup_name(&t1,
-                                         "6.7.8.9.a.b.c.d.e.f.a.b.c.d.e.f.0."
-                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."
-                                         "ip6.ARPA",
-                                         AF_UNSPEC, 0);
-  test_eq(i, -1);
-  i = tor_addr_parse_reverse_lookup_name(&t1,
-                                         "6.7.8.9.a.b.c.d.e.f.X.0.0.0.0.9."
-                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."
-                                         "ip6.ARPA",
-                                         AF_UNSPEC, 0);
-  test_eq(i, -1);
-  i = tor_addr_parse_reverse_lookup_name(&t1, "32.1.1.in-addr.arpa",
-                                         AF_UNSPEC, 0);
-  test_eq(i, -1);
-  i = tor_addr_parse_reverse_lookup_name(&t1, ".in-addr.arpa",
-                                         AF_UNSPEC, 0);
-  test_eq(i, -1);
-  i = tor_addr_parse_reverse_lookup_name(&t1, "1.2.3.4.5.in-addr.arpa",
-                                         AF_UNSPEC, 0);
-  test_eq(i, -1);
-  i = tor_addr_parse_reverse_lookup_name(&t1, "1.2.3.4.5.in-addr.arpa",
-                                         AF_INET6, 0);
-  test_eq(i, -1);
-  i = tor_addr_parse_reverse_lookup_name(&t1,
-                                         "6.7.8.9.a.b.c.d.e.f.a.b.c.d.e.0."
-                                         "f.e.e.b.1.e.b.e.e.f.f.e.e.e.d.9."
-                                         "ip6.ARPA",
-                                         AF_INET, 0);
-  test_eq(i, -1);
-
-  /* test tor_addr_parse_mask_ports */
-  test_addr_mask_ports_parse("[::f]/17:47-95", AF_INET6,
-                             0, 0, 0, 0x0000000f, 17, 47, 95);
-  //test_addr_parse("[::fefe:4.1.1.7/120]:999-1000");
-  //test_addr_parse_check("::fefe:401:107", 120, 999, 1000);
-  test_addr_mask_ports_parse("[::ffff:4.1.1.7]/120:443", AF_INET6,
-                             0, 0, 0x0000ffff, 0x04010107, 120, 443, 443);
-  test_addr_mask_ports_parse("[abcd:2::44a:0]:2-65000", AF_INET6,
-                             0xabcd0002, 0, 0, 0x044a0000, 128, 2, 65000);
-
-  r=tor_addr_parse_mask_ports("[fefef::]/112", &t1, NULL, NULL, NULL);
-  test_assert(r == -1);
-  r=tor_addr_parse_mask_ports("efef::/112", &t1, NULL, NULL, NULL);
-  test_assert(r == -1);
-  r=tor_addr_parse_mask_ports("[f:f:f:f:f:f:f:f::]", &t1, NULL, NULL, NULL);
-  test_assert(r == -1);
-  r=tor_addr_parse_mask_ports("[::f:f:f:f:f:f:f:f]", &t1, NULL, NULL, NULL);
-  test_assert(r == -1);
-  r=tor_addr_parse_mask_ports("[f:f:f:f:f:f:f:f:f]", &t1, NULL, NULL, NULL);
-  test_assert(r == -1);
-  /* Test for V4-mapped address with mask < 96.  (arguably not valid) */
-  r=tor_addr_parse_mask_ports("[::ffff:1.1.2.2/33]", &t1, &mask, NULL, NULL);
-  test_assert(r == -1);
-  r=tor_addr_parse_mask_ports("1.1.2.2/33", &t1, &mask, NULL, NULL);
-  test_assert(r == -1);
-  r=tor_addr_parse_mask_ports("1.1.2.2/31", &t1, &mask, NULL, NULL);
-  test_assert(r == AF_INET);
-  r=tor_addr_parse_mask_ports("[efef::]/112", &t1, &mask, &port1, &port2);
-  test_assert(r == AF_INET6);
-  test_assert(port1 == 1);
-  test_assert(port2 == 65535);
-
-  /* make sure inet address lengths >= max */
-  test_assert(INET_NTOA_BUF_LEN >= sizeof("255.255.255.255"));
-  test_assert(TOR_ADDR_BUF_LEN >=
-              sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"));
-
-  test_assert(sizeof(tor_addr_t) >= sizeof(struct in6_addr));
-
-  /* get interface addresses */
-  r = get_interface_address6(LOG_DEBUG, AF_INET, &t1);
-  i = get_interface_address6(LOG_DEBUG, AF_INET6, &t2);
-#if 0
-  tor_inet_ntop(AF_INET, &t1.sa.sin_addr, buf, sizeof(buf));
-  printf("\nv4 address: %s  (family=%i)", buf, IN_FAMILY(&t1));
-  tor_inet_ntop(AF_INET6, &t2.sa6.sin6_addr, buf, sizeof(buf));
-  printf("\nv6 address: %s  (family=%i)", buf, IN_FAMILY(&t2));
-#endif
-
- done:
-  ;
-}
-
-/** Run unit tests for basic dynamic-sized array functionality. */
-static void
-test_util_smartlist_basic(void)
-{
-  smartlist_t *sl;
-
-  /* XXXX test sort_digests, uniq_strings, uniq_digests */
-
-  /* Test smartlist add, del_keeporder, insert, get. */
-  sl = smartlist_create();
-  smartlist_add(sl, (void*)1);
-  smartlist_add(sl, (void*)2);
-  smartlist_add(sl, (void*)3);
-  smartlist_add(sl, (void*)4);
-  smartlist_del_keeporder(sl, 1);
-  smartlist_insert(sl, 1, (void*)22);
-  smartlist_insert(sl, 0, (void*)0);
-  smartlist_insert(sl, 5, (void*)555);
-  test_eq_ptr((void*)0,   smartlist_get(sl,0));
-  test_eq_ptr((void*)1,   smartlist_get(sl,1));
-  test_eq_ptr((void*)22,  smartlist_get(sl,2));
-  test_eq_ptr((void*)3,   smartlist_get(sl,3));
-  test_eq_ptr((void*)4,   smartlist_get(sl,4));
-  test_eq_ptr((void*)555, smartlist_get(sl,5));
-  /* Try deleting in the middle. */
-  smartlist_del(sl, 1);
-  test_eq_ptr((void*)555, smartlist_get(sl, 1));
-  /* Try deleting at the end. */
-  smartlist_del(sl, 4);
-  test_eq(4, smartlist_len(sl));
-
-  /* test isin. */
-  test_assert(smartlist_isin(sl, (void*)3));
-  test_assert(!smartlist_isin(sl, (void*)99));
-
- done:
-  smartlist_free(sl);
-}
-
-/** Run unit tests for smartlist-of-strings functionality. */
-static void
-test_util_smartlist_strings(void)
-{
-  smartlist_t *sl = smartlist_create();
-  char *cp=NULL, *cp_alloc=NULL;
-  size_t sz;
-
-  /* Test split and join */
-  test_eq(0, smartlist_len(sl));
-  smartlist_split_string(sl, "abc", ":", 0, 0);
-  test_eq(1, smartlist_len(sl));
-  test_streq("abc", smartlist_get(sl, 0));
-  smartlist_split_string(sl, "a::bc::", "::", 0, 0);
-  test_eq(4, smartlist_len(sl));
-  test_streq("a", smartlist_get(sl, 1));
-  test_streq("bc", smartlist_get(sl, 2));
-  test_streq("", smartlist_get(sl, 3));
-  cp_alloc = smartlist_join_strings(sl, "", 0, NULL);
-  test_streq(cp_alloc, "abcabc");
-  tor_free(cp_alloc);
-  cp_alloc = smartlist_join_strings(sl, "!", 0, NULL);
-  test_streq(cp_alloc, "abc!a!bc!");
-  tor_free(cp_alloc);
-  cp_alloc = smartlist_join_strings(sl, "XY", 0, NULL);
-  test_streq(cp_alloc, "abcXYaXYbcXY");
-  tor_free(cp_alloc);
-  cp_alloc = smartlist_join_strings(sl, "XY", 1, NULL);
-  test_streq(cp_alloc, "abcXYaXYbcXYXY");
-  tor_free(cp_alloc);
-  cp_alloc = smartlist_join_strings(sl, "", 1, NULL);
-  test_streq(cp_alloc, "abcabc");
-  tor_free(cp_alloc);
-
-  smartlist_split_string(sl, "/def/  /ghijk", "/", 0, 0);
-  test_eq(8, smartlist_len(sl));
-  test_streq("", smartlist_get(sl, 4));
-  test_streq("def", smartlist_get(sl, 5));
-  test_streq("  ", smartlist_get(sl, 6));
-  test_streq("ghijk", smartlist_get(sl, 7));
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_clear(sl);
-
-  smartlist_split_string(sl, "a,bbd,cdef", ",", SPLIT_SKIP_SPACE, 0);
-  test_eq(3, smartlist_len(sl));
-  test_streq("a", smartlist_get(sl,0));
-  test_streq("bbd", smartlist_get(sl,1));
-  test_streq("cdef", smartlist_get(sl,2));
-  smartlist_split_string(sl, " z <> zhasd <>  <> bnud<>   ", "<>",
-                         SPLIT_SKIP_SPACE, 0);
-  test_eq(8, smartlist_len(sl));
-  test_streq("z", smartlist_get(sl,3));
-  test_streq("zhasd", smartlist_get(sl,4));
-  test_streq("", smartlist_get(sl,5));
-  test_streq("bnud", smartlist_get(sl,6));
-  test_streq("", smartlist_get(sl,7));
-
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_clear(sl);
-
-  smartlist_split_string(sl, " ab\tc \td ef  ", NULL,
-                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
-  test_eq(4, smartlist_len(sl));
-  test_streq("ab", smartlist_get(sl,0));
-  test_streq("c", smartlist_get(sl,1));
-  test_streq("d", smartlist_get(sl,2));
-  test_streq("ef", smartlist_get(sl,3));
-  smartlist_split_string(sl, "ghi\tj", NULL,
-                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
-  test_eq(6, smartlist_len(sl));
-  test_streq("ghi", smartlist_get(sl,4));
-  test_streq("j", smartlist_get(sl,5));
-
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_clear(sl);
-
-  cp_alloc = smartlist_join_strings(sl, "XY", 0, NULL);
-  test_streq(cp_alloc, "");
-  tor_free(cp_alloc);
-  cp_alloc = smartlist_join_strings(sl, "XY", 1, NULL);
-  test_streq(cp_alloc, "XY");
-  tor_free(cp_alloc);
-
-  smartlist_split_string(sl, " z <> zhasd <>  <> bnud<>   ", "<>",
-                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
-  test_eq(3, smartlist_len(sl));
-  test_streq("z", smartlist_get(sl, 0));
-  test_streq("zhasd", smartlist_get(sl, 1));
-  test_streq("bnud", smartlist_get(sl, 2));
-  smartlist_split_string(sl, " z <> zhasd <>  <> bnud<>   ", "<>",
-                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2);
-  test_eq(5, smartlist_len(sl));
-  test_streq("z", smartlist_get(sl, 3));
-  test_streq("zhasd <>  <> bnud<>", smartlist_get(sl, 4));
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_clear(sl);
-
-  smartlist_split_string(sl, "abcd\n", "\n",
-                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
-  test_eq(1, smartlist_len(sl));
-  test_streq("abcd", smartlist_get(sl, 0));
-  smartlist_split_string(sl, "efgh", "\n",
-                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
-  test_eq(2, smartlist_len(sl));
-  test_streq("efgh", smartlist_get(sl, 1));
-
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_clear(sl);
-
-  /* Test swapping, shuffling, and sorting. */
-  smartlist_split_string(sl, "the,onion,router,by,arma,and,nickm", ",", 0, 0);
-  test_eq(7, smartlist_len(sl));
-  smartlist_sort(sl, _compare_strs);
-  cp_alloc = smartlist_join_strings(sl, ",", 0, NULL);
-  test_streq(cp_alloc,"and,arma,by,nickm,onion,router,the");
-  tor_free(cp_alloc);
-  smartlist_swap(sl, 1, 5);
-  cp_alloc = smartlist_join_strings(sl, ",", 0, NULL);
-  test_streq(cp_alloc,"and,router,by,nickm,onion,arma,the");
-  tor_free(cp_alloc);
-  smartlist_shuffle(sl);
-  test_eq(7, smartlist_len(sl));
-  test_assert(smartlist_string_isin(sl, "and"));
-  test_assert(smartlist_string_isin(sl, "router"));
-  test_assert(smartlist_string_isin(sl, "by"));
-  test_assert(smartlist_string_isin(sl, "nickm"));
-  test_assert(smartlist_string_isin(sl, "onion"));
-  test_assert(smartlist_string_isin(sl, "arma"));
-  test_assert(smartlist_string_isin(sl, "the"));
-
-  /* Test bsearch. */
-  smartlist_sort(sl, _compare_strs);
-  test_streq("nickm", smartlist_bsearch(sl, "zNicKM",
-                                        _compare_without_first_ch));
-  test_streq("and", smartlist_bsearch(sl, " AND", _compare_without_first_ch));
-  test_eq_ptr(NULL, smartlist_bsearch(sl, " ANz", _compare_without_first_ch));
-
-  /* Test bsearch_idx */
-  {
-    int f;
-    test_eq(0, smartlist_bsearch_idx(sl," aaa",_compare_without_first_ch,&f));
-    test_eq(f, 0);
-    test_eq(0, smartlist_bsearch_idx(sl," and",_compare_without_first_ch,&f));
-    test_eq(f, 1);
-    test_eq(1, smartlist_bsearch_idx(sl," arm",_compare_without_first_ch,&f));
-    test_eq(f, 0);
-    test_eq(1, smartlist_bsearch_idx(sl," arma",_compare_without_first_ch,&f));
-    test_eq(f, 1);
-    test_eq(2, smartlist_bsearch_idx(sl," armb",_compare_without_first_ch,&f));
-    test_eq(f, 0);
-    test_eq(7, smartlist_bsearch_idx(sl," zzzz",_compare_without_first_ch,&f));
-    test_eq(f, 0);
-  }
-
-  /* Test reverse() and pop_last() */
-  smartlist_reverse(sl);
-  cp_alloc = smartlist_join_strings(sl, ",", 0, NULL);
-  test_streq(cp_alloc,"the,router,onion,nickm,by,arma,and");
-  tor_free(cp_alloc);
-  cp_alloc = smartlist_pop_last(sl);
-  test_streq(cp_alloc, "and");
-  tor_free(cp_alloc);
-  test_eq(smartlist_len(sl), 6);
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_clear(sl);
-  cp_alloc = smartlist_pop_last(sl);
-  test_eq(cp_alloc, NULL);
-
-  /* Test uniq() */
-  smartlist_split_string(sl,
-                     "50,noon,radar,a,man,a,plan,a,canal,panama,radar,noon,50",
-                     ",", 0, 0);
-  smartlist_sort(sl, _compare_strs);
-  smartlist_uniq(sl, _compare_strs, _tor_free);
-  cp_alloc = smartlist_join_strings(sl, ",", 0, NULL);
-  test_streq(cp_alloc, "50,a,canal,man,noon,panama,plan,radar");
-  tor_free(cp_alloc);
-
-  /* Test string_isin and isin_case and num_isin */
-  test_assert(smartlist_string_isin(sl, "noon"));
-  test_assert(!smartlist_string_isin(sl, "noonoon"));
-  test_assert(smartlist_string_isin_case(sl, "nOOn"));
-  test_assert(!smartlist_string_isin_case(sl, "nooNooN"));
-  test_assert(smartlist_string_num_isin(sl, 50));
-  test_assert(!smartlist_string_num_isin(sl, 60));
-
-  /* Test smartlist_choose */
-  {
-    int i;
-    int allsame = 1;
-    int allin = 1;
-    void *first = smartlist_choose(sl);
-    test_assert(smartlist_isin(sl, first));
-    for (i = 0; i < 100; ++i) {
-      void *second = smartlist_choose(sl);
-      if (second != first)
-        allsame = 0;
-      if (!smartlist_isin(sl, second))
-        allin = 0;
-    }
-    test_assert(!allsame);
-    test_assert(allin);
-  }
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_clear(sl);
-
-  /* Test string_remove and remove and join_strings2 */
-  smartlist_split_string(sl,
-                    "Some say the Earth will end in ice and some in fire",
-                    " ", 0, 0);
-  cp = smartlist_get(sl, 4);
-  test_streq(cp, "will");
-  smartlist_add(sl, cp);
-  smartlist_remove(sl, cp);
-  tor_free(cp);
-  cp_alloc = smartlist_join_strings(sl, ",", 0, NULL);
-  test_streq(cp_alloc, "Some,say,the,Earth,fire,end,in,ice,and,some,in");
-  tor_free(cp_alloc);
-  smartlist_string_remove(sl, "in");
-  cp_alloc = smartlist_join_strings2(sl, "+XX", 1, 0, &sz);
-  test_streq(cp_alloc, "Some+say+the+Earth+fire+end+some+ice+and");
-  test_eq((int)sz, 40);
-
- done:
-
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_free(sl);
-  tor_free(cp_alloc);
-}
-
-/** Run unit tests for smartlist set manipulation functions. */
-static void
-test_util_smartlist_overlap(void)
-{
-  smartlist_t *sl = smartlist_create();
-  smartlist_t *ints = smartlist_create();
-  smartlist_t *odds = smartlist_create();
-  smartlist_t *evens = smartlist_create();
-  smartlist_t *primes = smartlist_create();
-  int i;
-  for (i=1; i < 10; i += 2)
-    smartlist_add(odds, (void*)(uintptr_t)i);
-  for (i=0; i < 10; i += 2)
-    smartlist_add(evens, (void*)(uintptr_t)i);
-
-  /* add_all */
-  smartlist_add_all(ints, odds);
-  smartlist_add_all(ints, evens);
-  test_eq(smartlist_len(ints), 10);
-
-  smartlist_add(primes, (void*)2);
-  smartlist_add(primes, (void*)3);
-  smartlist_add(primes, (void*)5);
-  smartlist_add(primes, (void*)7);
-
-  /* overlap */
-  test_assert(smartlist_overlap(ints, odds));
-  test_assert(smartlist_overlap(odds, primes));
-  test_assert(smartlist_overlap(evens, primes));
-  test_assert(!smartlist_overlap(odds, evens));
-
-  /* intersect */
-  smartlist_add_all(sl, odds);
-  smartlist_intersect(sl, primes);
-  test_eq(smartlist_len(sl), 3);
-  test_assert(smartlist_isin(sl, (void*)3));
-  test_assert(smartlist_isin(sl, (void*)5));
-  test_assert(smartlist_isin(sl, (void*)7));
-
-  /* subtract */
-  smartlist_add_all(sl, primes);
-  smartlist_subtract(sl, odds);
-  test_eq(smartlist_len(sl), 1);
-  test_assert(smartlist_isin(sl, (void*)2));
-
- done:
-  smartlist_free(odds);
-  smartlist_free(evens);
-  smartlist_free(ints);
-  smartlist_free(primes);
-  smartlist_free(sl);
-}
-
-/** Run unit tests for smartlist-of-digests functions. */
-static void
-test_util_smartlist_digests(void)
-{
-  smartlist_t *sl = smartlist_create();
-
-  /* digest_isin. */
-  smartlist_add(sl, tor_memdup("AAAAAAAAAAAAAAAAAAAA", DIGEST_LEN));
-  smartlist_add(sl, tor_memdup("\00090AAB2AAAAaasdAAAAA", DIGEST_LEN));
-  smartlist_add(sl, tor_memdup("\00090AAB2AAAAaasdAAAAA", DIGEST_LEN));
-  test_eq(0, smartlist_digest_isin(NULL, "AAAAAAAAAAAAAAAAAAAA"));
-  test_assert(smartlist_digest_isin(sl, "AAAAAAAAAAAAAAAAAAAA"));
-  test_assert(smartlist_digest_isin(sl, "\00090AAB2AAAAaasdAAAAA"));
-  test_eq(0, smartlist_digest_isin(sl, "\00090AAB2AAABaasdAAAAA"));
-
-  /* sort digests */
-  smartlist_sort_digests(sl);
-  test_memeq(smartlist_get(sl, 0), "\00090AAB2AAAAaasdAAAAA", DIGEST_LEN);
-  test_memeq(smartlist_get(sl, 1), "\00090AAB2AAAAaasdAAAAA", DIGEST_LEN);
-  test_memeq(smartlist_get(sl, 2), "AAAAAAAAAAAAAAAAAAAA", DIGEST_LEN);
-  test_eq(3, smartlist_len(sl));
-
-  /* uniq_digests */
-  smartlist_uniq_digests(sl);
-  test_eq(2, smartlist_len(sl));
-  test_memeq(smartlist_get(sl, 0), "\00090AAB2AAAAaasdAAAAA", DIGEST_LEN);
-  test_memeq(smartlist_get(sl, 1), "AAAAAAAAAAAAAAAAAAAA", DIGEST_LEN);
-
- done:
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_free(sl);
-}
-
-/** Run unit tests for concatenate-a-smartlist-of-strings functions. */
-static void
-test_util_smartlist_join(void)
-{
-  smartlist_t *sl = smartlist_create();
-  smartlist_t *sl2 = smartlist_create(), *sl3 = smartlist_create(),
-    *sl4 = smartlist_create();
-  char *joined=NULL;
-  /* unique, sorted. */
-  smartlist_split_string(sl,
-                         "Abashments Ambush Anchorman Bacon Banks Borscht "
-                         "Bunks Inhumane Insurance Knish Know Manners "
-                         "Maraschinos Stamina Sunbonnets Unicorns Wombats",
-                         " ", 0, 0);
-  /* non-unique, sorted. */
-  smartlist_split_string(sl2,
-                         "Ambush Anchorman Anchorman Anemias Anemias Bacon "
-                         "Crossbowmen Inhumane Insurance Knish Know Manners "
-                         "Manners Maraschinos Wombats Wombats Work",
-                         " ", 0, 0);
-  SMARTLIST_FOREACH_JOIN(sl, char *, cp1,
-                         sl2, char *, cp2,
-                         strcmp(cp1,cp2),
-                         smartlist_add(sl3, cp2)) {
-    test_streq(cp1, cp2);
-    smartlist_add(sl4, cp1);
-  } SMARTLIST_FOREACH_JOIN_END(cp1, cp2);
-
-  SMARTLIST_FOREACH(sl3, const char *, cp,
-                    test_assert(smartlist_isin(sl2, cp) &&
-                                !smartlist_string_isin(sl, cp)));
-  SMARTLIST_FOREACH(sl4, const char *, cp,
-                    test_assert(smartlist_isin(sl, cp) &&
-                                smartlist_string_isin(sl2, cp)));
-  joined = smartlist_join_strings(sl3, ",", 0, NULL);
-  test_streq(joined, "Anemias,Anemias,Crossbowmen,Work");
-  tor_free(joined);
-  joined = smartlist_join_strings(sl4, ",", 0, NULL);
-  test_streq(joined, "Ambush,Anchorman,Anchorman,Bacon,Inhumane,Insurance,"
-             "Knish,Know,Manners,Manners,Maraschinos,Wombats,Wombats");
-  tor_free(joined);
-
- done:
-  smartlist_free(sl4);
-  smartlist_free(sl3);
-  SMARTLIST_FOREACH(sl2, char *, cp, tor_free(cp));
-  smartlist_free(sl2);
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  smartlist_free(sl);
-  tor_free(joined);
-}
-
-/** Run unit tests for bitarray code */
-static void
-test_util_bitarray(void)
-{
-  bitarray_t *ba = NULL;
-  int i, j, ok=1;
-
-  ba = bitarray_init_zero(1);
-  test_assert(ba);
-  test_assert(! bitarray_is_set(ba, 0));
-  bitarray_set(ba, 0);
-  test_assert(bitarray_is_set(ba, 0));
-  bitarray_clear(ba, 0);
-  test_assert(! bitarray_is_set(ba, 0));
-  bitarray_free(ba);
-
-  ba = bitarray_init_zero(1023);
-  for (i = 1; i < 64; ) {
-    for (j = 0; j < 1023; ++j) {
-      if (j % i)
-        bitarray_set(ba, j);
-      else
-        bitarray_clear(ba, j);
-    }
-    for (j = 0; j < 1023; ++j) {
-      if (!bool_eq(bitarray_is_set(ba, j), j%i))
-        ok = 0;
-    }
-    test_assert(ok);
-    if (i < 7)
-      ++i;
-    else if (i == 28)
-      i = 32;
-    else
-      i += 7;
-  }
-
- done:
-  if (ba)
-    bitarray_free(ba);
-}
-
-/** Run unit tests for digest set code (implemented as a hashtable or as a
- * bloom filter) */
-static void
-test_util_digestset(void)
-{
-  smartlist_t *included = smartlist_create();
-  char d[DIGEST_LEN];
-  int i;
-  int ok = 1;
-  int false_positives = 0;
-  digestset_t *set = NULL;
-
-  for (i = 0; i < 1000; ++i) {
-    crypto_rand(d, DIGEST_LEN);
-    smartlist_add(included, tor_memdup(d, DIGEST_LEN));
-  }
-  set = digestset_new(1000);
-  SMARTLIST_FOREACH(included, const char *, cp,
-                    if (digestset_isin(set, cp))
-                      ok = 0);
-  test_assert(ok);
-  SMARTLIST_FOREACH(included, const char *, cp,
-                    digestset_add(set, cp));
-  SMARTLIST_FOREACH(included, const char *, cp,
-                    if (!digestset_isin(set, cp))
-                      ok = 0);
-  test_assert(ok);
-  for (i = 0; i < 1000; ++i) {
-    crypto_rand(d, DIGEST_LEN);
-    if (digestset_isin(set, d))
-      ++false_positives;
-  }
-  test_assert(false_positives < 50); /* Should be far lower. */
-
- done:
-  if (set)
-    digestset_free(set);
-  SMARTLIST_FOREACH(included, char *, cp, tor_free(cp));
-  smartlist_free(included);
-}
-
-/** mutex for thread test to stop the threads hitting data at the same time. */
-static tor_mutex_t *_thread_test_mutex = NULL;
-/** mutexes for the thread test to make sure that the threads have to
- * interleave somewhat. */
-static tor_mutex_t *_thread_test_start1 = NULL,
-                   *_thread_test_start2 = NULL;
-/** Shared strmap for the thread test. */
-static strmap_t *_thread_test_strmap = NULL;
-/** The name of thread1 for the thread test */
-static char *_thread1_name = NULL;
-/** The name of thread2 for the thread test */
-static char *_thread2_name = NULL;
-
-static void _thread_test_func(void* _s) ATTR_NORETURN;
-
-/** How many iterations have the threads in the unit test run? */
-static int t1_count = 0, t2_count = 0;
-
-/** Helper function for threading unit tests: This function runs in a
- * subthread. It grabs its own mutex (start1 or start2) to make sure that it
- * should start, then it repeatedly alters _test_thread_strmap protected by
- * _thread_test_mutex. */
-static void
-_thread_test_func(void* _s)
-{
-  char *s = _s;
-  int i, *count;
-  tor_mutex_t *m;
-  char buf[64];
-  char **cp;
-  if (!strcmp(s, "thread 1")) {
-    m = _thread_test_start1;
-    cp = &_thread1_name;
-    count = &t1_count;
-  } else {
-    m = _thread_test_start2;
-    cp = &_thread2_name;
-    count = &t2_count;
-  }
-  tor_mutex_acquire(m);
-
-  tor_snprintf(buf, sizeof(buf), "%lu", tor_get_thread_id());
-  *cp = tor_strdup(buf);
-
-  for (i=0; i<10000; ++i) {
-    tor_mutex_acquire(_thread_test_mutex);
-    strmap_set(_thread_test_strmap, "last to run", *cp);
-    ++*count;
-    tor_mutex_release(_thread_test_mutex);
-  }
-  tor_mutex_acquire(_thread_test_mutex);
-  strmap_set(_thread_test_strmap, s, *cp);
-  tor_mutex_release(_thread_test_mutex);
-
-  tor_mutex_release(m);
-
-  spawn_exit();
-}
-
-/** Run unit tests for threading logic. */
-static void
-test_util_threads(void)
-{
-  char *s1 = NULL, *s2 = NULL;
-  int done = 0, timedout = 0;
-  time_t started;
-#ifndef TOR_IS_MULTITHREADED
-  /* Skip this test if we aren't threading. We should be threading most
-   * everywhere by now. */
-  if (1)
-    return;
-#endif
-  _thread_test_mutex = tor_mutex_new();
-  _thread_test_start1 = tor_mutex_new();
-  _thread_test_start2 = tor_mutex_new();
-  _thread_test_strmap = strmap_new();
-  s1 = tor_strdup("thread 1");
-  s2 = tor_strdup("thread 2");
-  tor_mutex_acquire(_thread_test_start1);
-  tor_mutex_acquire(_thread_test_start2);
-  spawn_func(_thread_test_func, s1);
-  spawn_func(_thread_test_func, s2);
-  tor_mutex_release(_thread_test_start2);
-  tor_mutex_release(_thread_test_start1);
-  started = time(NULL);
-  while (!done) {
-    tor_mutex_acquire(_thread_test_mutex);
-    strmap_assert_ok(_thread_test_strmap);
-    if (strmap_get(_thread_test_strmap, "thread 1") &&
-        strmap_get(_thread_test_strmap, "thread 2")) {
-      done = 1;
-    } else if (time(NULL) > started + 25) {
-      timedout = done = 1;
-    }
-    tor_mutex_release(_thread_test_mutex);
-  }
-  tor_mutex_free(_thread_test_mutex);
-
-  tor_mutex_acquire(_thread_test_start1);
-  tor_mutex_release(_thread_test_start1);
-  tor_mutex_acquire(_thread_test_start2);
-  tor_mutex_release(_thread_test_start2);
-
-  if (timedout) {
-    printf("\nTimed out: %d %d", t1_count, t2_count);
-    test_assert(strmap_get(_thread_test_strmap, "thread 1"));
-    test_assert(strmap_get(_thread_test_strmap, "thread 2"));
-    test_assert(!timedout);
-  }
-
-  /* different thread IDs. */
-  test_assert(strcmp(strmap_get(_thread_test_strmap, "thread 1"),
-                     strmap_get(_thread_test_strmap, "thread 2")));
-  test_assert(!strcmp(strmap_get(_thread_test_strmap, "thread 1"),
-                      strmap_get(_thread_test_strmap, "last to run")) ||
-              !strcmp(strmap_get(_thread_test_strmap, "thread 2"),
-                      strmap_get(_thread_test_strmap, "last to run")));
-
- done:
-  tor_free(s1);
-  tor_free(s2);
-  tor_free(_thread1_name);
-  tor_free(_thread2_name);
-  if (_thread_test_strmap)
-    strmap_free(_thread_test_strmap, NULL);
-  if (_thread_test_start1)
-    tor_mutex_free(_thread_test_start1);
-  if (_thread_test_start2)
-    tor_mutex_free(_thread_test_start2);
-}
-
-/** Helper: return a tristate based on comparing two strings. */
-static int
-_compare_strings_for_pqueue(const void *s1, const void *s2)
-{
-  return strcmp((const char*)s1, (const char*)s2);
-}
-
-/** Run unit tests for heap-based priority queue functions. */
-static void
-test_util_pqueue(void)
-{
-  smartlist_t *sl = smartlist_create();
-  int (*cmp)(const void *, const void*);
-#define OK() smartlist_pqueue_assert_ok(sl, cmp)
-
-  cmp = _compare_strings_for_pqueue;
-
-  smartlist_pqueue_add(sl, cmp, (char*)"cows");
-  smartlist_pqueue_add(sl, cmp, (char*)"zebras");
-  smartlist_pqueue_add(sl, cmp, (char*)"fish");
-  smartlist_pqueue_add(sl, cmp, (char*)"frogs");
-  smartlist_pqueue_add(sl, cmp, (char*)"apples");
-  smartlist_pqueue_add(sl, cmp, (char*)"squid");
-  smartlist_pqueue_add(sl, cmp, (char*)"daschunds");
-  smartlist_pqueue_add(sl, cmp, (char*)"eggplants");
-  smartlist_pqueue_add(sl, cmp, (char*)"weissbier");
-  smartlist_pqueue_add(sl, cmp, (char*)"lobsters");
-  smartlist_pqueue_add(sl, cmp, (char*)"roquefort");
-
-  OK();
-
-  test_eq(smartlist_len(sl), 11);
-  test_streq(smartlist_get(sl, 0), "apples");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "apples");
-  test_eq(smartlist_len(sl), 10);
-  OK();
-  test_streq(smartlist_pqueue_pop(sl, cmp), "cows");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "daschunds");
-  smartlist_pqueue_add(sl, cmp, (char*)"chinchillas");
-  OK();
-  smartlist_pqueue_add(sl, cmp, (char*)"fireflies");
-  OK();
-  test_streq(smartlist_pqueue_pop(sl, cmp), "chinchillas");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "eggplants");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "fireflies");
-  OK();
-  test_streq(smartlist_pqueue_pop(sl, cmp), "fish");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "frogs");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "lobsters");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "roquefort");
-  OK();
-  test_eq(smartlist_len(sl), 3);
-  test_streq(smartlist_pqueue_pop(sl, cmp), "squid");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "weissbier");
-  test_streq(smartlist_pqueue_pop(sl, cmp), "zebras");
-  test_eq(smartlist_len(sl), 0);
-  OK();
-#undef OK
-
- done:
-
-  smartlist_free(sl);
-}
-
-/** Run unit tests for compression functions */
-static void
-test_util_gzip(void)
-{
-  char *buf1=NULL, *buf2=NULL, *buf3=NULL, *cp1, *cp2;
-  const char *ccp2;
-  size_t len1, len2;
-  tor_zlib_state_t *state = NULL;
-
-  buf1 = tor_strdup("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ");
-  test_assert(detect_compression_method(buf1, strlen(buf1)) == UNKNOWN_METHOD);
-  if (is_gzip_supported()) {
-    test_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1,
-                                   GZIP_METHOD));
-    test_assert(buf2);
-    test_assert(!memcmp(buf2, "\037\213", 2)); /* Gzip magic. */
-    test_assert(detect_compression_method(buf2, len1) == GZIP_METHOD);
-
-    test_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1,
-                                     GZIP_METHOD, 1, LOG_INFO));
-    test_assert(buf3);
-    test_streq(buf1,buf3);
-
-    tor_free(buf2);
-    tor_free(buf3);
-  }
-
-  test_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1,
-                                 ZLIB_METHOD));
-  test_assert(buf2);
-  test_assert(!memcmp(buf2, "\x78\xDA", 2)); /* deflate magic. */
-  test_assert(detect_compression_method(buf2, len1) == ZLIB_METHOD);
-
-  test_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1,
-                                   ZLIB_METHOD, 1, LOG_INFO));
-  test_assert(buf3);
-  test_streq(buf1,buf3);
-
-  /* Check whether we can uncompress concatenated, compressed strings. */
-  tor_free(buf3);
-  buf2 = tor_realloc(buf2, len1*2);
-  memcpy(buf2+len1, buf2, len1);
-  test_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1*2,
-                                   ZLIB_METHOD, 1, LOG_INFO));
-  test_eq(len2, (strlen(buf1)+1)*2);
-  test_memeq(buf3,
-             "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ\0"
-             "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ\0",
-             (strlen(buf1)+1)*2);
-
-  tor_free(buf1);
-  tor_free(buf2);
-  tor_free(buf3);
-
-  /* Check whether we can uncompress partial strings. */
-  buf1 =
-    tor_strdup("String with low redundancy that won't be compressed much.");
-  test_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1,
-                                 ZLIB_METHOD));
-  tor_assert(len1>16);
-  /* when we allow an incomplete string, we should succeed.*/
-  tor_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1-16,
-                                  ZLIB_METHOD, 0, LOG_INFO));
-  buf3[len2]='\0';
-  tor_assert(len2 > 5);
-  tor_assert(!strcmpstart(buf1, buf3));
-
-  /* when we demand a complete string, this must fail. */
-  tor_free(buf3);
-  tor_assert(tor_gzip_uncompress(&buf3, &len2, buf2, len1-16,
-                                 ZLIB_METHOD, 1, LOG_INFO));
-  tor_assert(!buf3);
-
-  /* Now, try streaming compression. */
-  tor_free(buf1);
-  tor_free(buf2);
-  tor_free(buf3);
-  state = tor_zlib_new(1, ZLIB_METHOD);
-  tor_assert(state);
-  cp1 = buf1 = tor_malloc(1024);
-  len1 = 1024;
-  ccp2 = "ABCDEFGHIJABCDEFGHIJ";
-  len2 = 21;
-  test_assert(tor_zlib_process(state, &cp1, &len1, &ccp2, &len2, 0)
-              == TOR_ZLIB_OK);
-  test_eq(len2, 0); /* Make sure we compressed it all. */
-  test_assert(cp1 > buf1);
-
-  len2 = 0;
-  cp2 = cp1;
-  test_assert(tor_zlib_process(state, &cp1, &len1, &ccp2, &len2, 1)
-              == TOR_ZLIB_DONE);
-  test_eq(len2, 0);
-  test_assert(cp1 > cp2); /* Make sure we really added something. */
-
-  tor_assert(!tor_gzip_uncompress(&buf3, &len2, buf1, 1024-len1,
-                                  ZLIB_METHOD, 1, LOG_WARN));
-  test_streq(buf3, "ABCDEFGHIJABCDEFGHIJ"); /*Make sure it compressed right.*/
-
- done:
-  if (state)
-    tor_zlib_free(state);
-  tor_free(buf2);
-  tor_free(buf3);
-  tor_free(buf1);
-}
-
-/** Run unit tests for string-to-void* map functions */
-static void
-test_util_strmap(void)
-{
-  strmap_t *map;
-  strmap_iter_t *iter;
-  const char *k;
-  void *v;
-  char *visited = NULL;
-  smartlist_t *found_keys = NULL;
-
-  map = strmap_new();
-  test_assert(map);
-  test_eq(strmap_size(map), 0);
-  test_assert(strmap_isempty(map));
-  v = strmap_set(map, "K1", (void*)99);
-  test_eq(v, NULL);
-  test_assert(!strmap_isempty(map));
-  v = strmap_set(map, "K2", (void*)101);
-  test_eq(v, NULL);
-  v = strmap_set(map, "K1", (void*)100);
-  test_eq(v, (void*)99);
-  test_eq_ptr(strmap_get(map,"K1"), (void*)100);
-  test_eq_ptr(strmap_get(map,"K2"), (void*)101);
-  test_eq_ptr(strmap_get(map,"K-not-there"), NULL);
-  strmap_assert_ok(map);
-
-  v = strmap_remove(map,"K2");
-  strmap_assert_ok(map);
-  test_eq_ptr(v, (void*)101);
-  test_eq_ptr(strmap_get(map,"K2"), NULL);
-  test_eq_ptr(strmap_remove(map,"K2"), NULL);
-
-  strmap_set(map, "K2", (void*)101);
-  strmap_set(map, "K3", (void*)102);
-  strmap_set(map, "K4", (void*)103);
-  test_eq(strmap_size(map), 4);
-  strmap_assert_ok(map);
-  strmap_set(map, "K5", (void*)104);
-  strmap_set(map, "K6", (void*)105);
-  strmap_assert_ok(map);
-
-  /* Test iterator. */
-  iter = strmap_iter_init(map);
-  found_keys = smartlist_create();
-  while (!strmap_iter_done(iter)) {
-    strmap_iter_get(iter,&k,&v);
-    smartlist_add(found_keys, tor_strdup(k));
-    test_eq_ptr(v, strmap_get(map, k));
-
-    if (!strcmp(k, "K2")) {
-      iter = strmap_iter_next_rmv(map,iter);
-    } else {
-      iter = strmap_iter_next(map,iter);
-    }
-  }
-
-  /* Make sure we removed K2, but not the others. */
-  test_eq_ptr(strmap_get(map, "K2"), NULL);
-  test_eq_ptr(strmap_get(map, "K5"), (void*)104);
-  /* Make sure we visited everyone once */
-  smartlist_sort_strings(found_keys);
-  visited = smartlist_join_strings(found_keys, ":", 0, NULL);
-  test_streq(visited, "K1:K2:K3:K4:K5:K6");
-
-  strmap_assert_ok(map);
-  /* Clean up after ourselves. */
-  strmap_free(map, NULL);
-  map = NULL;
-
-  /* Now try some lc functions. */
-  map = strmap_new();
-  strmap_set_lc(map,"Ab.C", (void*)1);
-  test_eq_ptr(strmap_get(map,"ab.c"), (void*)1);
-  strmap_assert_ok(map);
-  test_eq_ptr(strmap_get_lc(map,"AB.C"), (void*)1);
-  test_eq_ptr(strmap_get(map,"AB.C"), NULL);
-  test_eq_ptr(strmap_remove_lc(map,"aB.C"), (void*)1);
-  strmap_assert_ok(map);
-  test_eq_ptr(strmap_get_lc(map,"AB.C"), NULL);
-
- done:
-  if (map)
-    strmap_free(map,NULL);
-  if (found_keys) {
-    SMARTLIST_FOREACH(found_keys, char *, cp, tor_free(cp));
-    smartlist_free(found_keys);
-  }
-  tor_free(visited);
-}
-
-/** Run unit tests for mmap() wrapper functionality. */
-static void
-test_util_mmap(void)
-{
-  char *fname1 = tor_strdup(get_fname("mapped_1"));
-  char *fname2 = tor_strdup(get_fname("mapped_2"));
-  char *fname3 = tor_strdup(get_fname("mapped_3"));
-  const size_t buflen = 17000;
-  char *buf = tor_malloc(17000);
-  tor_mmap_t *mapping = NULL;
-
-  crypto_rand(buf, buflen);
-
-  mapping = tor_mmap_file(fname1);
-  test_assert(! mapping);
-
-  write_str_to_file(fname1, "Short file.", 1);
-  write_bytes_to_file(fname2, buf, buflen, 1);
-  write_bytes_to_file(fname3, buf, 16384, 1);
-
-  mapping = tor_mmap_file(fname1);
-  test_assert(mapping);
-  test_eq(mapping->size, strlen("Short file."));
-  test_streq(mapping->data, "Short file.");
-#ifdef MS_WINDOWS
-  tor_munmap_file(mapping);
-  mapping = NULL;
-  test_assert(unlink(fname1) == 0);
-#else
-  /* make sure we can unlink. */
-  test_assert(unlink(fname1) == 0);
-  test_streq(mapping->data, "Short file.");
-  tor_munmap_file(mapping);
-  mapping = NULL;
-#endif
-
-  /* Now a zero-length file. */
-  write_str_to_file(fname1, "", 1);
-  mapping = tor_mmap_file(fname1);
-  test_eq(mapping, NULL);
-  test_eq(ERANGE, errno);
-  unlink(fname1);
-
-  /* Make sure that we fail to map a no-longer-existent file. */
-  mapping = tor_mmap_file(fname1);
-  test_assert(mapping == NULL);
-
-  /* Now try a big file that stretches across a few pages and isn't aligned */
-  mapping = tor_mmap_file(fname2);
-  test_assert(mapping);
-  test_eq(mapping->size, buflen);
-  test_memeq(mapping->data, buf, buflen);
-  tor_munmap_file(mapping);
-  mapping = NULL;
-
-  /* Now try a big aligned file. */
-  mapping = tor_mmap_file(fname3);
-  test_assert(mapping);
-  test_eq(mapping->size, 16384);
-  test_memeq(mapping->data, buf, 16384);
-  tor_munmap_file(mapping);
-  mapping = NULL;
-
- done:
-  unlink(fname1);
-  unlink(fname2);
-  unlink(fname3);
-
-  tor_free(fname1);
-  tor_free(fname2);
-  tor_free(fname3);
-  tor_free(buf);
-
-  if (mapping)
-    tor_munmap_file(mapping);
-}
-
-/** Run unit tests for escaping/unescaping data for use by controllers. */
-static void
-test_util_control_formats(void)
-{
-  char *out = NULL;
-  const char *inp =
-    "..This is a test\r\nof the emergency \nbroadcast\r\n..system.\r\nZ.\r\n";
-  size_t sz;
-
-  sz = read_escaped_data(inp, strlen(inp), &out);
-  test_streq(out,
-             ".This is a test\nof the emergency \nbroadcast\n.system.\nZ.\n");
-  test_eq(sz, strlen(out));
-
- done:
-  tor_free(out);
-}
-
-static void
-test_util_sscanf(void)
-{
-  unsigned u1, u2, u3;
-  char s1[10], s2[10], s3[10], ch;
-  int r;
-
-  r = tor_sscanf("hello world", "hello world"); /* String match: success */
-  test_eq(r, 0);
-  r = tor_sscanf("hello world 3", "hello worlb %u", &u1); /* String fail */
-  test_eq(r, 0);
-  r = tor_sscanf("12345", "%u", &u1); /* Simple number */
-  test_eq(r, 1);
-  test_eq(u1, 12345u);
-  r = tor_sscanf("", "%u", &u1); /* absent number */
-  test_eq(r, 0);
-  r = tor_sscanf("A", "%u", &u1); /* bogus number */
-  test_eq(r, 0);
-  r = tor_sscanf("4294967295", "%u", &u1); /* UINT32_MAX should work. */
-  test_eq(r, 1);
-  test_eq(u1, 4294967295u);
-  r = tor_sscanf("4294967296", "%u", &u1); /* Always say -1 at 32 bits. */
-  test_eq(r, 0);
-  r = tor_sscanf("123456", "%2u%u", &u1, &u2); /* Width */
-  test_eq(r, 2);
-  test_eq(u1, 12u);
-  test_eq(u2, 3456u);
-  r = tor_sscanf("!12:3:456", "!%2u:%2u:%3u", &u1, &u2, &u3); /* separators */
-  test_eq(r, 3);
-  test_eq(u1, 12u);
-  test_eq(u2, 3u);
-  test_eq(u3, 456u);
-  r = tor_sscanf("12:3:045", "%2u:%2u:%3u", &u1, &u2, &u3); /* 0s */
-  test_eq(r, 3);
-  test_eq(u1, 12u);
-  test_eq(u2, 3u);
-  test_eq(u3, 45u);
-  /* %u does not match space.*/
-  r = tor_sscanf("12:3: 45", "%2u:%2u:%3u", &u1, &u2, &u3);
-  test_eq(r, 2);
-  /* %u does not match negative numbers. */
-  r = tor_sscanf("12:3:-4", "%2u:%2u:%3u", &u1, &u2, &u3);
-  test_eq(r, 2);
-  /* Arbitrary amounts of 0-padding are okay */
-  r = tor_sscanf("12:03:000000000000000099", "%2u:%2u:%u", &u1, &u2, &u3);
-  test_eq(r, 3);
-  test_eq(u1, 12u);
-  test_eq(u2, 3u);
-  test_eq(u3, 99u);
-
-  r = tor_sscanf("99% fresh", "%3u%% fresh", &u1); /* percents are scannable.*/
-  test_eq(r, 1);
-  test_eq(u1, 99);
-
-  r = tor_sscanf("hello", "%s", s1); /* %s needs a number. */
-  test_eq(r, -1);
-
-  r = tor_sscanf("hello", "%3s%7s", s1, s2); /* %s matches characters. */
-  test_eq(r, 2);
-  test_streq(s1, "hel");
-  test_streq(s2, "lo");
-  r = tor_sscanf("WD40", "%2s%u", s3, &u1); /* %s%u */
-  test_eq(r, 2);
-  test_streq(s3, "WD");
-  test_eq(u1, 40);
-  r = tor_sscanf("76trombones", "%6u%9s", &u1, s1); /* %u%s */
-  test_eq(r, 2);
-  test_eq(u1, 76);
-  test_streq(s1, "trombones");
-  r = tor_sscanf("hello world", "%9s %9s", s1, s2); /* %s doesn't eat space. */
-  test_eq(r, 2);
-  test_streq(s1, "hello");
-  test_streq(s2, "world");
-  r = tor_sscanf("hi", "%9s%9s%3s", s1, s2, s3); /* %s can be empty. */
-  test_eq(r, 3);
-  test_streq(s1, "hi");
-  test_streq(s2, "");
-  test_streq(s3, "");
-
-  r = tor_sscanf("1.2.3", "%u.%u.%u%c", &u1, &u2, &u3, &ch);
-  test_eq(r, 3);
-  r = tor_sscanf("1.2.3 foobar", "%u.%u.%u%c", &u1, &u2, &u3, &ch);
-  test_eq(r, 4);
-
- done:
-  ;
-}
-
-/** Run unit tests for the onion handshake code. */
-static void
-test_onion_handshake(void)
-{
-  /* client-side */
-  crypto_dh_env_t *c_dh = NULL;
-  char c_buf[ONIONSKIN_CHALLENGE_LEN];
-  char c_keys[40];
-
-  /* server-side */
-  char s_buf[ONIONSKIN_REPLY_LEN];
-  char s_keys[40];
-
-  /* shared */
-  crypto_pk_env_t *pk = NULL;
-
-  pk = pk_generate(0);
-
-  /* client handshake 1. */
-  memset(c_buf, 0, ONIONSKIN_CHALLENGE_LEN);
-  test_assert(! onion_skin_create(pk, &c_dh, c_buf));
-
-  /* server handshake */
-  memset(s_buf, 0, ONIONSKIN_REPLY_LEN);
-  memset(s_keys, 0, 40);
-  test_assert(! onion_skin_server_handshake(c_buf, pk, NULL,
-                                            s_buf, s_keys, 40));
-
-  /* client handshake 2 */
-  memset(c_keys, 0, 40);
-  test_assert(! onion_skin_client_handshake(c_dh, s_buf, c_keys, 40));
-
-  if (memcmp(c_keys, s_keys, 40)) {
-    puts("Aiiiie");
-    exit(1);
-  }
-  test_memeq(c_keys, s_keys, 40);
-  memset(s_buf, 0, 40);
-  test_memneq(c_keys, s_buf, 40);
-
- done:
-  if (c_dh)
-    crypto_dh_free(c_dh);
-  if (pk)
-    crypto_free_pk_env(pk);
-}
-
-/** Run unit tests for router descriptor generation logic. */
-static void
-test_dir_format(void)
-{
-  char buf[8192], buf2[8192];
-  char platform[256];
-  char fingerprint[FINGERPRINT_LEN+1];
-  char *pk1_str = NULL, *pk2_str = NULL, *pk3_str = NULL, *cp;
-  size_t pk1_str_len, pk2_str_len, pk3_str_len;
-  routerinfo_t *r1=NULL, *r2=NULL;
-  crypto_pk_env_t *pk1 = NULL, *pk2 = NULL, *pk3 = NULL;
-  routerinfo_t *rp1 = NULL;
-  addr_policy_t *ex1, *ex2;
-  routerlist_t *dir1 = NULL, *dir2 = NULL;
-  tor_version_t ver1;
-
-  pk1 = pk_generate(0);
-  pk2 = pk_generate(1);
-  pk3 = pk_generate(2);
-
-  test_assert( is_legal_nickname("a"));
-  test_assert(!is_legal_nickname(""));
-  test_assert(!is_legal_nickname("abcdefghijklmnopqrst")); /* 20 chars */
-  test_assert(!is_legal_nickname("hyphen-")); /* bad char */
-  test_assert( is_legal_nickname("abcdefghijklmnopqrs")); /* 19 chars */
-  test_assert(!is_legal_nickname("$AAAAAAAA01234AAAAAAAAAAAAAAAAAAAAAAAAAAA"));
-  /* valid */
-  test_assert( is_legal_nickname_or_hexdigest(
-                                 "$AAAAAAAA01234AAAAAAAAAAAAAAAAAAAAAAAAAAA"));
-  test_assert( is_legal_nickname_or_hexdigest(
-                         "$AAAAAAAA01234AAAAAAAAAAAAAAAAAAAAAAAAAAA=fred"));
-  test_assert( is_legal_nickname_or_hexdigest(
-                         "$AAAAAAAA01234AAAAAAAAAAAAAAAAAAAAAAAAAAA~fred"));
-  /* too short */
-  test_assert(!is_legal_nickname_or_hexdigest(
-                                 "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"));
-  /* illegal char */
-  test_assert(!is_legal_nickname_or_hexdigest(
-                                 "$AAAAAAzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"));
-  /* hex part too long */
-  test_assert(!is_legal_nickname_or_hexdigest(
-                         "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"));
-  test_assert(!is_legal_nickname_or_hexdigest(
-                         "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=fred"));
-  /* Bad nickname */
-  test_assert(!is_legal_nickname_or_hexdigest(
-                         "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="));
-  test_assert(!is_legal_nickname_or_hexdigest(
-                         "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~"));
-  test_assert(!is_legal_nickname_or_hexdigest(
-                       "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~hyphen-"));
-  test_assert(!is_legal_nickname_or_hexdigest(
-                       "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~"
-                       "abcdefghijklmnoppqrst"));
-  /* Bad extra char. */
-  test_assert(!is_legal_nickname_or_hexdigest(
-                         "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA!"));
-  test_assert(is_legal_nickname_or_hexdigest("xyzzy"));
-  test_assert(is_legal_nickname_or_hexdigest("abcdefghijklmnopqrs"));
-  test_assert(!is_legal_nickname_or_hexdigest("abcdefghijklmnopqrst"));
-
-  get_platform_str(platform, sizeof(platform));
-  r1 = tor_malloc_zero(sizeof(routerinfo_t));
-  r1->address = tor_strdup("18.244.0.1");
-  r1->addr = 0xc0a80001u; /* 192.168.0.1 */
-  r1->cache_info.published_on = 0;
-  r1->or_port = 9000;
-  r1->dir_port = 9003;
-  r1->onion_pkey = crypto_pk_dup_key(pk1);
-  r1->identity_pkey = crypto_pk_dup_key(pk2);
-  r1->bandwidthrate = 1000;
-  r1->bandwidthburst = 5000;
-  r1->bandwidthcapacity = 10000;
-  r1->exit_policy = NULL;
-  r1->nickname = tor_strdup("Magri");
-  r1->platform = tor_strdup(platform);
-
-  ex1 = tor_malloc_zero(sizeof(addr_policy_t));
-  ex2 = tor_malloc_zero(sizeof(addr_policy_t));
-  ex1->policy_type = ADDR_POLICY_ACCEPT;
-  tor_addr_from_ipv4h(&ex1->addr, 0);
-  ex1->maskbits = 0;
-  ex1->prt_min = ex1->prt_max = 80;
-  ex2->policy_type = ADDR_POLICY_REJECT;
-  tor_addr_from_ipv4h(&ex2->addr, 18<<24);
-  ex2->maskbits = 8;
-  ex2->prt_min = ex2->prt_max = 24;
-  r2 = tor_malloc_zero(sizeof(routerinfo_t));
-  r2->address = tor_strdup("1.1.1.1");
-  r2->addr = 0x0a030201u; /* 10.3.2.1 */
-  r2->platform = tor_strdup(platform);
-  r2->cache_info.published_on = 5;
-  r2->or_port = 9005;
-  r2->dir_port = 0;
-  r2->onion_pkey = crypto_pk_dup_key(pk2);
-  r2->identity_pkey = crypto_pk_dup_key(pk1);
-  r2->bandwidthrate = r2->bandwidthburst = r2->bandwidthcapacity = 3000;
-  r2->exit_policy = smartlist_create();
-  smartlist_add(r2->exit_policy, ex2);
-  smartlist_add(r2->exit_policy, ex1);
-  r2->nickname = tor_strdup("Fred");
-
-  test_assert(!crypto_pk_write_public_key_to_string(pk1, &pk1_str,
-                                                    &pk1_str_len));
-  test_assert(!crypto_pk_write_public_key_to_string(pk2 , &pk2_str,
-                                                    &pk2_str_len));
-  test_assert(!crypto_pk_write_public_key_to_string(pk3 , &pk3_str,
-                                                    &pk3_str_len));
-
-  memset(buf, 0, 2048);
-  test_assert(router_dump_router_to_string(buf, 2048, r1, pk2)>0);
-
-  strlcpy(buf2, "router Magri 18.244.0.1 9000 0 9003\n"
-          "platform Tor "VERSION" on ", sizeof(buf2));
-  strlcat(buf2, get_uname(), sizeof(buf2));
-  strlcat(buf2, "\n"
-          "opt protocols Link 1 2 Circuit 1\n"
-          "published 1970-01-01 00:00:00\n"
-          "opt fingerprint ", sizeof(buf2));
-  test_assert(!crypto_pk_get_fingerprint(pk2, fingerprint, 1));
-  strlcat(buf2, fingerprint, sizeof(buf2));
-  strlcat(buf2, "\nuptime 0\n"
-  /* XXX the "0" above is hard-coded, but even if we made it reflect
-   * uptime, that still wouldn't make it right, because the two
-   * descriptors might be made on different seconds... hm. */
-         "bandwidth 1000 5000 10000\n"
-          "opt extra-info-digest 0000000000000000000000000000000000000000\n"
-          "onion-key\n", sizeof(buf2));
-  strlcat(buf2, pk1_str, sizeof(buf2));
-  strlcat(buf2, "signing-key\n", sizeof(buf2));
-  strlcat(buf2, pk2_str, sizeof(buf2));
-  strlcat(buf2, "opt hidden-service-dir\n", sizeof(buf2));
-  strlcat(buf2, "reject *:*\nrouter-signature\n", sizeof(buf2));
-  buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same
-                             * twice */
-
-  test_streq(buf, buf2);
-
-  test_assert(router_dump_router_to_string(buf, 2048, r1, pk2)>0);
-  cp = buf;
-  rp1 = router_parse_entry_from_string((const char*)cp,NULL,1,0,NULL);
-  test_assert(rp1);
-  test_streq(rp1->address, r1->address);
-  test_eq(rp1->or_port, r1->or_port);
-  //test_eq(rp1->dir_port, r1->dir_port);
-  test_eq(rp1->bandwidthrate, r1->bandwidthrate);
-  test_eq(rp1->bandwidthburst, r1->bandwidthburst);
-  test_eq(rp1->bandwidthcapacity, r1->bandwidthcapacity);
-  test_assert(crypto_pk_cmp_keys(rp1->onion_pkey, pk1) == 0);
-  test_assert(crypto_pk_cmp_keys(rp1->identity_pkey, pk2) == 0);
-  //test_assert(rp1->exit_policy == NULL);
-
-#if 0
-  /* XXX Once we have exit policies, test this again. XXX */
-  strlcpy(buf2, "router tor.tor.tor 9005 0 0 3000\n", sizeof(buf2));
-  strlcat(buf2, pk2_str, sizeof(buf2));
-  strlcat(buf2, "signing-key\n", sizeof(buf2));
-  strlcat(buf2, pk1_str, sizeof(buf2));
-  strlcat(buf2, "accept *:80\nreject 18.*:24\n\n", sizeof(buf2));
-  test_assert(router_dump_router_to_string(buf, 2048, &r2, pk2)>0);
-  test_streq(buf, buf2);
-
-  cp = buf;
-  rp2 = router_parse_entry_from_string(&cp,1);
-  test_assert(rp2);
-  test_streq(rp2->address, r2.address);
-  test_eq(rp2->or_port, r2.or_port);
-  test_eq(rp2->dir_port, r2.dir_port);
-  test_eq(rp2->bandwidth, r2.bandwidth);
-  test_assert(crypto_pk_cmp_keys(rp2->onion_pkey, pk2) == 0);
-  test_assert(crypto_pk_cmp_keys(rp2->identity_pkey, pk1) == 0);
-  test_eq(rp2->exit_policy->policy_type, EXIT_POLICY_ACCEPT);
-  test_streq(rp2->exit_policy->string, "accept *:80");
-  test_streq(rp2->exit_policy->address, "*");
-  test_streq(rp2->exit_policy->port, "80");
-  test_eq(rp2->exit_policy->next->policy_type, EXIT_POLICY_REJECT);
-  test_streq(rp2->exit_policy->next->string, "reject 18.*:24");
-  test_streq(rp2->exit_policy->next->address, "18.*");
-  test_streq(rp2->exit_policy->next->port, "24");
-  test_assert(rp2->exit_policy->next->next == NULL);
-
-  /* Okay, now for the directories. */
-  {
-    fingerprint_list = smartlist_create();
-    crypto_pk_get_fingerprint(pk2, buf, 1);
-    add_fingerprint_to_dir("Magri", buf, fingerprint_list);
-    crypto_pk_get_fingerprint(pk1, buf, 1);
-    add_fingerprint_to_dir("Fred", buf, fingerprint_list);
-  }
-
-  {
-  char d[DIGEST_LEN];
-  const char *m;
-  /* XXXX NM re-enable. */
-  /* Make sure routers aren't too far in the past any more. */
-  r1->cache_info.published_on = time(NULL);
-  r2->cache_info.published_on = time(NULL)-3*60*60;
-  test_assert(router_dump_router_to_string(buf, 2048, r1, pk2)>0);
-  test_eq(dirserv_add_descriptor(buf,&m,""), ROUTER_ADDED_NOTIFY_GENERATOR);
-  test_assert(router_dump_router_to_string(buf, 2048, r2, pk1)>0);
-  test_eq(dirserv_add_descriptor(buf,&m,""), ROUTER_ADDED_NOTIFY_GENERATOR);
-  get_options()->Nickname = tor_strdup("DirServer");
-  test_assert(!dirserv_dump_directory_to_string(&cp,pk3, 0));
-  crypto_pk_get_digest(pk3, d);
-  test_assert(!router_parse_directory(cp));
-  test_eq(2, smartlist_len(dir1->routers));
-  tor_free(cp);
-  }
-#endif
-  dirserv_free_fingerprint_list();
-
-  /* Try out version parsing functionality */
-  test_eq(0, tor_version_parse("0.3.4pre2-cvs", &ver1));
-  test_eq(0, ver1.major);
-  test_eq(3, ver1.minor);
-  test_eq(4, ver1.micro);
-  test_eq(VER_PRE, ver1.status);
-  test_eq(2, ver1.patchlevel);
-  test_eq(0, tor_version_parse("0.3.4rc1", &ver1));
-  test_eq(0, ver1.major);
-  test_eq(3, ver1.minor);
-  test_eq(4, ver1.micro);
-  test_eq(VER_RC, ver1.status);
-  test_eq(1, ver1.patchlevel);
-  test_eq(0, tor_version_parse("1.3.4", &ver1));
-  test_eq(1, ver1.major);
-  test_eq(3, ver1.minor);
-  test_eq(4, ver1.micro);
-  test_eq(VER_RELEASE, ver1.status);
-  test_eq(0, ver1.patchlevel);
-  test_eq(0, tor_version_parse("1.3.4.999", &ver1));
-  test_eq(1, ver1.major);
-  test_eq(3, ver1.minor);
-  test_eq(4, ver1.micro);
-  test_eq(VER_RELEASE, ver1.status);
-  test_eq(999, ver1.patchlevel);
-  test_eq(0, tor_version_parse("0.1.2.4-alpha", &ver1));
-  test_eq(0, ver1.major);
-  test_eq(1, ver1.minor);
-  test_eq(2, ver1.micro);
-  test_eq(4, ver1.patchlevel);
-  test_eq(VER_RELEASE, ver1.status);
-  test_streq("alpha", ver1.status_tag);
-  test_eq(0, tor_version_parse("0.1.2.4", &ver1));
-  test_eq(0, ver1.major);
-  test_eq(1, ver1.minor);
-  test_eq(2, ver1.micro);
-  test_eq(4, ver1.patchlevel);
-  test_eq(VER_RELEASE, ver1.status);
-  test_streq("", ver1.status_tag);
-
-#define test_eq_vs(vs1, vs2) test_eq_type(version_status_t, "%d", (vs1), (vs2))
-#define test_v_i_o(val, ver, lst) \
-  test_eq_vs(val, tor_version_is_obsolete(ver, lst))
-
-  /* make sure tor_version_is_obsolete() works */
-  test_v_i_o(VS_OLD, "0.0.1", "Tor 0.0.2");
-  test_v_i_o(VS_OLD, "0.0.1", "0.0.2, Tor 0.0.3");
-  test_v_i_o(VS_OLD, "0.0.1", "0.0.2,Tor 0.0.3");
-  test_v_i_o(VS_OLD, "0.0.1","0.0.3,BetterTor 0.0.1");
-  test_v_i_o(VS_RECOMMENDED, "0.0.2", "Tor 0.0.2,Tor 0.0.3");
-  test_v_i_o(VS_NEW_IN_SERIES, "0.0.2", "Tor 0.0.2pre1,Tor 0.0.3");
-  test_v_i_o(VS_OLD, "0.0.2", "Tor 0.0.2.1,Tor 0.0.3");
-  test_v_i_o(VS_NEW, "0.1.0", "Tor 0.0.2,Tor 0.0.3");
-  test_v_i_o(VS_RECOMMENDED, "0.0.7rc2", "0.0.7,Tor 0.0.7rc2,Tor 0.0.8");
-  test_v_i_o(VS_OLD, "0.0.5.0", "0.0.5.1-cvs");
-  test_v_i_o(VS_NEW_IN_SERIES, "0.0.5.1-cvs", "0.0.5, 0.0.6");
-  /* Not on list, but newer than any in same series. */
-  test_v_i_o(VS_NEW_IN_SERIES, "0.1.0.3",
-             "Tor 0.1.0.2,Tor 0.0.9.5,Tor 0.1.1.0");
-  /* Series newer than any on list. */
-  test_v_i_o(VS_NEW, "0.1.2.3", "Tor 0.1.0.2,Tor 0.0.9.5,Tor 0.1.1.0");
-  /* Series older than any on list. */
-  test_v_i_o(VS_OLD, "0.0.1.3", "Tor 0.1.0.2,Tor 0.0.9.5,Tor 0.1.1.0");
-  /* Not on list, not newer than any on same series. */
-  test_v_i_o(VS_UNRECOMMENDED, "0.1.0.1",
-             "Tor 0.1.0.2,Tor 0.0.9.5,Tor 0.1.1.0");
-  /* On list, not newer than any on same series. */
-  test_v_i_o(VS_UNRECOMMENDED,
-             "0.1.0.1", "Tor 0.1.0.2,Tor 0.0.9.5,Tor 0.1.1.0");
-  test_eq(0, tor_version_as_new_as("Tor 0.0.5", "0.0.9pre1-cvs"));
-  test_eq(1, tor_version_as_new_as(
-          "Tor 0.0.8 on Darwin 64-121-192-100.c3-0."
-          "sfpo-ubr1.sfrn-sfpo.ca.cable.rcn.com Power Macintosh",
-          "0.0.8rc2"));
-  test_eq(0, tor_version_as_new_as(
-          "Tor 0.0.8 on Darwin 64-121-192-100.c3-0."
-          "sfpo-ubr1.sfrn-sfpo.ca.cable.rcn.com Power Macintosh", "0.0.8.2"));
-
-  /* Now try svn revisions. */
-  test_eq(1, tor_version_as_new_as("Tor 0.2.1.0-dev (r100)",
-                                   "Tor 0.2.1.0-dev (r99)"));
-  test_eq(1, tor_version_as_new_as("Tor 0.2.1.0-dev (r100) on Banana Jr",
-                                   "Tor 0.2.1.0-dev (r99) on Hal 9000"));
-  test_eq(1, tor_version_as_new_as("Tor 0.2.1.0-dev (r100)",
-                                   "Tor 0.2.1.0-dev on Colossus"));
-  test_eq(0, tor_version_as_new_as("Tor 0.2.1.0-dev (r99)",
-                                   "Tor 0.2.1.0-dev (r100)"));
-  test_eq(0, tor_version_as_new_as("Tor 0.2.1.0-dev (r99) on MCP",
-                                   "Tor 0.2.1.0-dev (r100) on AM"));
-  test_eq(0, tor_version_as_new_as("Tor 0.2.1.0-dev",
-                                   "Tor 0.2.1.0-dev (r99)"));
-  test_eq(1, tor_version_as_new_as("Tor 0.2.1.1",
-                                   "Tor 0.2.1.0-dev (r99)"));
- done:
-  if (r1)
-    routerinfo_free(r1);
-  if (r2)
-    routerinfo_free(r2);
-
-  tor_free(pk1_str);
-  tor_free(pk2_str);
-  tor_free(pk3_str);
-  if (pk1) crypto_free_pk_env(pk1);
-  if (pk2) crypto_free_pk_env(pk2);
-  if (pk3) crypto_free_pk_env(pk3);
-  if (rp1) routerinfo_free(rp1);
-  tor_free(dir1); /* XXXX And more !*/
-  tor_free(dir2); /* And more !*/
-}
-
-/** Run unit tests for misc directory functions. */
-static void
-test_dirutil(void)
-{
-  smartlist_t *sl = smartlist_create();
-  fp_pair_t *pair;
-
-  dir_split_resource_into_fingerprint_pairs(
-       /* Two pairs, out of order, with one duplicate. */
-       "73656372657420646174612E0000000000FFFFFF-"
-       "557365204145532d32353620696e73746561642e+"
-       "73656372657420646174612E0000000000FFFFFF-"
-       "557365204145532d32353620696e73746561642e+"
-       "48657861646563696d616c2069736e277420736f-"
-       "676f6f6420666f7220686964696e6720796f7572.z", sl);
-
-  test_eq(smartlist_len(sl), 2);
-  pair = smartlist_get(sl, 0);
-  test_memeq(pair->first,  "Hexadecimal isn't so", DIGEST_LEN);
-  test_memeq(pair->second, "good for hiding your", DIGEST_LEN);
-  pair = smartlist_get(sl, 1);
-  test_memeq(pair->first,  "secret data.\0\0\0\0\0\xff\xff\xff", DIGEST_LEN);
-  test_memeq(pair->second, "Use AES-256 instead.", DIGEST_LEN);
-
- done:
-  SMARTLIST_FOREACH(sl, fp_pair_t *, pair, tor_free(pair));
-  smartlist_free(sl);
-}
-
-static void
-test_dirutil_measured_bw(void)
-{
-  measured_bw_line_t mbwl;
-  int i;
-  const char *lines_pass[] = {
-    "node_id=$557365204145532d32353620696e73746561642e bw=1024\n",
-    "node_id=$557365204145532d32353620696e73746561642e\t  bw=1024 \n",
-    " node_id=$557365204145532d32353620696e73746561642e  bw=1024\n",
-    "\tnoise\tnode_id=$557365204145532d32353620696e73746561642e  "
-                "bw=1024 junk=007\n",
-    "misc=junk node_id=$557365204145532d32353620696e73746561642e  "
-                "bw=1024 junk=007\n",
-    "end"
-  };
-  const char *lines_fail[] = {
-    /* Test possible python stupidity on input */
-    "node_id=None bw=1024\n",
-    "node_id=$None bw=1024\n",
-    "node_id=$557365204145532d32353620696e73746561642e bw=None\n",
-    "node_id=$557365204145532d32353620696e73746561642e bw=1024.0\n",
-    "node_id=$557365204145532d32353620696e73746561642e bw=.1024\n",
-    "node_id=$557365204145532d32353620696e73746561642e bw=1.024\n",
-    "node_id=$557365204145532d32353620696e73746561642e bw=1024 bw=0\n",
-    "node_id=$557365204145532d32353620696e73746561642e bw=1024 bw=None\n",
-    "node_id=$557365204145532d32353620696e73746561642e bw=-1024\n",
-    /* Test incomplete writes due to race conditions, partial copies, etc */
-    "node_i",
-    "node_i\n",
-    "node_id=",
-    "node_id=\n",
-    "node_id=$557365204145532d32353620696e73746561642e bw=",
-    "node_id=$557365204145532d32353620696e73746561642e bw=1024",
-    "node_id=$557365204145532d32353620696e73746561642e bw=\n",
-    "node_id=$557365204145532d32353620696e7374",
-    "node_id=$557365204145532d32353620696e7374\n",
-    "",
-    "\n",
-    " \n ",
-    " \n\n",
-    /* Test assorted noise */
-    " node_id= ",
-    "node_id==$557365204145532d32353620696e73746561642e bw==1024\n",
-    "node_id=$55736520414552d32353620696e73746561642e bw=1024\n",
-    "node_id=557365204145532d32353620696e73746561642e bw=1024\n",
-    "node_id= $557365204145532d32353620696e73746561642e bw=0.23\n",
-    "end"
-  };
-
-  for (i = 0; strcmp(lines_fail[i], "end"); i++) {
-    //fprintf(stderr, "Testing: %s\n", lines_fail[i]);
-    test_assert(measured_bw_line_parse(&mbwl, lines_fail[i]) == -1);
-  }
-
-  for (i = 0; strcmp(lines_pass[i], "end"); i++) {
-    //fprintf(stderr, "Testing: %s %d\n", lines_pass[i], TOR_ISSPACE('\n'));
-    test_assert(measured_bw_line_parse(&mbwl, lines_pass[i]) == 0);
-    test_assert(mbwl.bw == 1024);
-    test_assert(strcmp(mbwl.node_hex,
-                "557365204145532d32353620696e73746561642e") == 0);
-  }
-
-done:
-  return;
-}
-
-extern const char AUTHORITY_CERT_1[];
-extern const char AUTHORITY_SIGNKEY_1[];
-extern const char AUTHORITY_CERT_2[];
-extern const char AUTHORITY_SIGNKEY_2[];
-extern const char AUTHORITY_CERT_3[];
-extern const char AUTHORITY_SIGNKEY_3[];
-
-/** Helper: Test that two networkstatus_voter_info_t do in fact represent the
- * same voting authority, and that they do in fact have all the same
- * information. */
-static void
-test_same_voter(networkstatus_voter_info_t *v1,
-                networkstatus_voter_info_t *v2)
-{
-  test_streq(v1->nickname, v2->nickname);
-  test_memeq(v1->identity_digest, v2->identity_digest, DIGEST_LEN);
-  test_streq(v1->address, v2->address);
-  test_eq(v1->addr, v2->addr);
-  test_eq(v1->dir_port, v2->dir_port);
-  test_eq(v1->or_port, v2->or_port);
-  test_streq(v1->contact, v2->contact);
-  test_memeq(v1->vote_digest, v2->vote_digest, DIGEST_LEN);
- done:
-  ;
-}
-
-/** Run unit tests for getting the median of a list. */
-static void
-test_util_order_functions(void)
-{
-  int lst[25], n = 0;
-  //  int a=12,b=24,c=25,d=60,e=77;
-
-#define median() median_int(lst, n)
-
-  lst[n++] = 12;
-  test_eq(12, median()); /* 12 */
-  lst[n++] = 77;
-  //smartlist_shuffle(sl);
-  test_eq(12, median()); /* 12, 77 */
-  lst[n++] = 77;
-  //smartlist_shuffle(sl);
-  test_eq(77, median()); /* 12, 77, 77 */
-  lst[n++] = 24;
-  test_eq(24, median()); /* 12,24,77,77 */
-  lst[n++] = 60;
-  lst[n++] = 12;
-  lst[n++] = 25;
-  //smartlist_shuffle(sl);
-  test_eq(25, median()); /* 12,12,24,25,60,77,77 */
-#undef median
-
- done:
-  ;
-}
-
-/** Helper: Make a new routerinfo containing the right information for a
- * given vote_routerstatus_t. */
-static routerinfo_t *
-generate_ri_from_rs(const vote_routerstatus_t *vrs)
-{
-  routerinfo_t *r;
-  const routerstatus_t *rs = &vrs->status;
-  static time_t published = 0;
-
-  r = tor_malloc_zero(sizeof(routerinfo_t));
-  memcpy(r->cache_info.identity_digest, rs->identity_digest, DIGEST_LEN);
-  memcpy(r->cache_info.signed_descriptor_digest, rs->descriptor_digest,
-         DIGEST_LEN);
-  r->cache_info.do_not_cache = 1;
-  r->cache_info.routerlist_index = -1;
-  r->cache_info.signed_descriptor_body =
-    tor_strdup("123456789012345678901234567890123");
-  r->cache_info.signed_descriptor_len =
-    strlen(r->cache_info.signed_descriptor_body);
-  r->exit_policy = smartlist_create();
-  r->cache_info.published_on = ++published + time(NULL);
-  return r;
-}
-
-/** Run unit tests for generating and parsing V3 consensus networkstatus
- * documents. */
-static void
-test_v3_networkstatus(void)
-{
-  authority_cert_t *cert1=NULL, *cert2=NULL, *cert3=NULL;
-  crypto_pk_env_t *sign_skey_1=NULL, *sign_skey_2=NULL, *sign_skey_3=NULL;
-  crypto_pk_env_t *sign_skey_leg1=NULL;
-  const char *msg=NULL;
-
-  time_t now = time(NULL);
-  networkstatus_voter_info_t *voter;
-  networkstatus_t *vote=NULL, *v1=NULL, *v2=NULL, *v3=NULL, *con=NULL;
-  vote_routerstatus_t *vrs;
-  routerstatus_t *rs;
-  char *v1_text=NULL, *v2_text=NULL, *v3_text=NULL, *consensus_text=NULL, *cp;
-  smartlist_t *votes = smartlist_create();
-
-  /* For generating the two other consensuses. */
-  char *detached_text1=NULL, *detached_text2=NULL;
-  char *consensus_text2=NULL, *consensus_text3=NULL;
-  networkstatus_t *con2=NULL, *con3=NULL;
-  ns_detached_signatures_t *dsig1=NULL, *dsig2=NULL;
-
-  /* Parse certificates and keys. */
-  cert1 = authority_cert_parse_from_string(AUTHORITY_CERT_1, NULL);
-  test_assert(cert1);
-  test_assert(cert1->is_cross_certified);
-  cert2 = authority_cert_parse_from_string(AUTHORITY_CERT_2, NULL);
-  test_assert(cert2);
-  cert3 = authority_cert_parse_from_string(AUTHORITY_CERT_3, NULL);
-  test_assert(cert3);
-  sign_skey_1 = crypto_new_pk_env();
-  sign_skey_2 = crypto_new_pk_env();
-  sign_skey_3 = crypto_new_pk_env();
-  sign_skey_leg1 = pk_generate(4);
-
-  test_assert(!crypto_pk_read_private_key_from_string(sign_skey_1,
-                                                      AUTHORITY_SIGNKEY_1));
-  test_assert(!crypto_pk_read_private_key_from_string(sign_skey_2,
-                                                      AUTHORITY_SIGNKEY_2));
-  test_assert(!crypto_pk_read_private_key_from_string(sign_skey_3,
-                                                      AUTHORITY_SIGNKEY_3));
-
-  test_assert(!crypto_pk_cmp_keys(sign_skey_1, cert1->signing_key));
-  test_assert(!crypto_pk_cmp_keys(sign_skey_2, cert2->signing_key));
-
-  /*
-   * Set up a vote; generate it; try to parse it.
-   */
-  vote = tor_malloc_zero(sizeof(networkstatus_t));
-  vote->type = NS_TYPE_VOTE;
-  vote->published = now;
-  vote->valid_after = now+1000;
-  vote->fresh_until = now+2000;
-  vote->valid_until = now+3000;
-  vote->vote_seconds = 100;
-  vote->dist_seconds = 200;
-  vote->supported_methods = smartlist_create();
-  smartlist_split_string(vote->supported_methods, "1 2 3", NULL, 0, -1);
-  vote->client_versions = tor_strdup("0.1.2.14,0.1.2.15");
-  vote->server_versions = tor_strdup("0.1.2.14,0.1.2.15,0.1.2.16");
-  vote->known_flags = smartlist_create();
-  smartlist_split_string(vote->known_flags,
-                     "Authority Exit Fast Guard Running Stable V2Dir Valid",
-                     0, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
-  vote->voters = smartlist_create();
-  voter = tor_malloc_zero(sizeof(networkstatus_voter_info_t));
-  voter->nickname = tor_strdup("Voter1");
-  voter->address = tor_strdup("1.2.3.4");
-  voter->addr = 0x01020304;
-  voter->dir_port = 80;
-  voter->or_port = 9000;
-  voter->contact = tor_strdup("voter at example.com");
-  crypto_pk_get_digest(cert1->identity_key, voter->identity_digest);
-  smartlist_add(vote->voters, voter);
-  vote->cert = authority_cert_dup(cert1);
-  vote->routerstatus_list = smartlist_create();
-  /* add the first routerstatus. */
-  vrs = tor_malloc_zero(sizeof(vote_routerstatus_t));
-  rs = &vrs->status;
-  vrs->version = tor_strdup("0.1.2.14");
-  rs->published_on = now-1500;
-  strlcpy(rs->nickname, "router2", sizeof(rs->nickname));
-  memset(rs->identity_digest, 3, DIGEST_LEN);
-  memset(rs->descriptor_digest, 78, DIGEST_LEN);
-  rs->addr = 0x99008801;
-  rs->or_port = 443;
-  rs->dir_port = 8000;
-  /* all flags but running cleared */
-  rs->is_running = 1;
-  smartlist_add(vote->routerstatus_list, vrs);
-  test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0);
-
-  /* add the second routerstatus. */
-  vrs = tor_malloc_zero(sizeof(vote_routerstatus_t));
-  rs = &vrs->status;
-  vrs->version = tor_strdup("0.2.0.5");
-  rs->published_on = now-1000;
-  strlcpy(rs->nickname, "router1", sizeof(rs->nickname));
-  memset(rs->identity_digest, 5, DIGEST_LEN);
-  memset(rs->descriptor_digest, 77, DIGEST_LEN);
-  rs->addr = 0x99009901;
-  rs->or_port = 443;
-  rs->dir_port = 0;
-  rs->is_exit = rs->is_stable = rs->is_fast = rs->is_running =
-    rs->is_valid = rs->is_v2_dir = rs->is_possible_guard = 1;
-  smartlist_add(vote->routerstatus_list, vrs);
-  test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0);
-
-  /* add the third routerstatus. */
-  vrs = tor_malloc_zero(sizeof(vote_routerstatus_t));
-  rs = &vrs->status;
-  vrs->version = tor_strdup("0.1.0.3");
-  rs->published_on = now-1000;
-  strlcpy(rs->nickname, "router3", sizeof(rs->nickname));
-  memset(rs->identity_digest, 33, DIGEST_LEN);
-  memset(rs->descriptor_digest, 79, DIGEST_LEN);
-  rs->addr = 0xAA009901;
-  rs->or_port = 400;
-  rs->dir_port = 9999;
-  rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast =
-    rs->is_running = rs->is_valid = rs->is_v2_dir = rs->is_possible_guard = 1;
-  smartlist_add(vote->routerstatus_list, vrs);
-  test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0);
-
-  /* add a fourth routerstatus that is not running. */
-  vrs = tor_malloc_zero(sizeof(vote_routerstatus_t));
-  rs = &vrs->status;
-  vrs->version = tor_strdup("0.1.6.3");
-  rs->published_on = now-1000;
-  strlcpy(rs->nickname, "router4", sizeof(rs->nickname));
-  memset(rs->identity_digest, 34, DIGEST_LEN);
-  memset(rs->descriptor_digest, 48, DIGEST_LEN);
-  rs->addr = 0xC0000203;
-  rs->or_port = 500;
-  rs->dir_port = 1999;
-  /* Running flag (and others) cleared */
-  smartlist_add(vote->routerstatus_list, vrs);
-  test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0);
-
-  /* dump the vote and try to parse it. */
-  v1_text = format_networkstatus_vote(sign_skey_1, vote);
-  test_assert(v1_text);
-  v1 = networkstatus_parse_vote_from_string(v1_text, NULL, NS_TYPE_VOTE);
-  test_assert(v1);
-
-  /* Make sure the parsed thing was right. */
-  test_eq(v1->type, NS_TYPE_VOTE);
-  test_eq(v1->published, vote->published);
-  test_eq(v1->valid_after, vote->valid_after);
-  test_eq(v1->fresh_until, vote->fresh_until);
-  test_eq(v1->valid_until, vote->valid_until);
-  test_eq(v1->vote_seconds, vote->vote_seconds);
-  test_eq(v1->dist_seconds, vote->dist_seconds);
-  test_streq(v1->client_versions, vote->client_versions);
-  test_streq(v1->server_versions, vote->server_versions);
-  test_assert(v1->voters && smartlist_len(v1->voters));
-  voter = smartlist_get(v1->voters, 0);
-  test_streq(voter->nickname, "Voter1");
-  test_streq(voter->address, "1.2.3.4");
-  test_eq(voter->addr, 0x01020304);
-  test_eq(voter->dir_port, 80);
-  test_eq(voter->or_port, 9000);
-  test_streq(voter->contact, "voter at example.com");
-  test_assert(v1->cert);
-  test_assert(!crypto_pk_cmp_keys(sign_skey_1, v1->cert->signing_key));
-  cp = smartlist_join_strings(v1->known_flags, ":", 0, NULL);
-  test_streq(cp, "Authority:Exit:Fast:Guard:Running:Stable:V2Dir:Valid");
-  tor_free(cp);
-  test_eq(smartlist_len(v1->routerstatus_list), 4);
-  /* Check the first routerstatus. */
-  vrs = smartlist_get(v1->routerstatus_list, 0);
-  rs = &vrs->status;
-  test_streq(vrs->version, "0.1.2.14");
-  test_eq(rs->published_on, now-1500);
-  test_streq(rs->nickname, "router2");
-  test_memeq(rs->identity_digest,
-             "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3",
-             DIGEST_LEN);
-  test_memeq(rs->descriptor_digest, "NNNNNNNNNNNNNNNNNNNN", DIGEST_LEN);
-  test_eq(rs->addr, 0x99008801);
-  test_eq(rs->or_port, 443);
-  test_eq(rs->dir_port, 8000);
-  test_eq(vrs->flags, U64_LITERAL(16)); // no flags except "running"
-  /* Check the second routerstatus. */
-  vrs = smartlist_get(v1->routerstatus_list, 1);
-  rs = &vrs->status;
-  test_streq(vrs->version, "0.2.0.5");
-  test_eq(rs->published_on, now-1000);
-  test_streq(rs->nickname, "router1");
-  test_memeq(rs->identity_digest,
-             "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5",
-             DIGEST_LEN);
-  test_memeq(rs->descriptor_digest, "MMMMMMMMMMMMMMMMMMMM", DIGEST_LEN);
-  test_eq(rs->addr, 0x99009901);
-  test_eq(rs->or_port, 443);
-  test_eq(rs->dir_port, 0);
-  test_eq(vrs->flags, U64_LITERAL(254)); // all flags except "authority."
-
-  {
-    measured_bw_line_t mbw;
-    memset(mbw.node_id, 33, sizeof(mbw.node_id));
-    mbw.bw = 1024;
-    test_assert(measured_bw_line_apply(&mbw,
-                v1->routerstatus_list) == 1);
-    vrs = smartlist_get(v1->routerstatus_list, 2);
-    test_assert(vrs->status.has_measured_bw &&
-                vrs->status.measured_bw == 1024);
-  }
-
-  /* Generate second vote. It disagrees on some of the times,
-   * and doesn't list versions, and knows some crazy flags */
-  vote->published = now+1;
-  vote->fresh_until = now+3005;
-  vote->dist_seconds = 300;
-  authority_cert_free(vote->cert);
-  vote->cert = authority_cert_dup(cert2);
-  tor_free(vote->client_versions);
-  tor_free(vote->server_versions);
-  voter = smartlist_get(vote->voters, 0);
-  tor_free(voter->nickname);
-  tor_free(voter->address);
-  voter->nickname = tor_strdup("Voter2");
-  voter->address = tor_strdup("2.3.4.5");
-  voter->addr = 0x02030405;
-  crypto_pk_get_digest(cert2->identity_key, voter->identity_digest);
-  smartlist_add(vote->known_flags, tor_strdup("MadeOfCheese"));
-  smartlist_add(vote->known_flags, tor_strdup("MadeOfTin"));
-  smartlist_sort_strings(vote->known_flags);
-  vrs = smartlist_get(vote->routerstatus_list, 2);
-  smartlist_del_keeporder(vote->routerstatus_list, 2);
-  tor_free(vrs->version);
-  tor_free(vrs);
-  vrs = smartlist_get(vote->routerstatus_list, 0);
-  vrs->status.is_fast = 1;
-  /* generate and parse. */
-  v2_text = format_networkstatus_vote(sign_skey_2, vote);
-  test_assert(v2_text);
-  v2 = networkstatus_parse_vote_from_string(v2_text, NULL, NS_TYPE_VOTE);
-  test_assert(v2);
-  /* Check that flags come out right.*/
-  cp = smartlist_join_strings(v2->known_flags, ":", 0, NULL);
-  test_streq(cp, "Authority:Exit:Fast:Guard:MadeOfCheese:MadeOfTin:"
-             "Running:Stable:V2Dir:Valid");
-  tor_free(cp);
-  vrs = smartlist_get(v2->routerstatus_list, 1);
-  /* 1023 - authority(1) - madeofcheese(16) - madeoftin(32) */
-  test_eq(vrs->flags, U64_LITERAL(974));
-
-  /* Generate the third vote. */
-  vote->published = now;
-  vote->fresh_until = now+2003;
-  vote->dist_seconds = 250;
-  authority_cert_free(vote->cert);
-  vote->cert = authority_cert_dup(cert3);
-  smartlist_add(vote->supported_methods, tor_strdup("4"));
-  vote->client_versions = tor_strdup("0.1.2.14,0.1.2.17");
-  vote->server_versions = tor_strdup("0.1.2.10,0.1.2.15,0.1.2.16");
-  voter = smartlist_get(vote->voters, 0);
-  tor_free(voter->nickname);
-  tor_free(voter->address);
-  voter->nickname = tor_strdup("Voter3");
-  voter->address = tor_strdup("3.4.5.6");
-  voter->addr = 0x03040506;
-  crypto_pk_get_digest(cert3->identity_key, voter->identity_digest);
-  /* This one has a legacy id. */
-  memset(voter->legacy_id_digest, (int)'A', DIGEST_LEN);
-  vrs = smartlist_get(vote->routerstatus_list, 0);
-  smartlist_del_keeporder(vote->routerstatus_list, 0);
-  tor_free(vrs->version);
-  tor_free(vrs);
-  vrs = smartlist_get(vote->routerstatus_list, 0);
-  memset(vrs->status.descriptor_digest, (int)'Z', DIGEST_LEN);
-  test_assert(router_add_to_routerlist(generate_ri_from_rs(vrs), &msg,0,0)>=0);
-
-  v3_text = format_networkstatus_vote(sign_skey_3, vote);
-  test_assert(v3_text);
-
-  v3 = networkstatus_parse_vote_from_string(v3_text, NULL, NS_TYPE_VOTE);
-  test_assert(v3);
-
-  /* Compute a consensus as voter 3. */
-  smartlist_add(votes, v3);
-  smartlist_add(votes, v1);
-  smartlist_add(votes, v2);
-  consensus_text = networkstatus_compute_consensus(votes, 3,
-                                                   cert3->identity_key,
-                                                   sign_skey_3,
-                                                   "AAAAAAAAAAAAAAAAAAAA",
-                                                   sign_skey_leg1);
-  test_assert(consensus_text);
-  con = networkstatus_parse_vote_from_string(consensus_text, NULL,
-                                             NS_TYPE_CONSENSUS);
-  test_assert(con);
-  //log_notice(LD_GENERAL, "<<%s>>\n<<%s>>\n<<%s>>\n",
-  //           v1_text, v2_text, v3_text);
-
-  /* Check consensus contents. */
-  test_assert(con->type == NS_TYPE_CONSENSUS);
-  test_eq(con->published, 0); /* this field only appears in votes. */
-  test_eq(con->valid_after, now+1000);
-  test_eq(con->fresh_until, now+2003); /* median */
-  test_eq(con->valid_until, now+3000);
-  test_eq(con->vote_seconds, 100);
-  test_eq(con->dist_seconds, 250); /* median */
-  test_streq(con->client_versions, "0.1.2.14");
-  test_streq(con->server_versions, "0.1.2.15,0.1.2.16");
-  cp = smartlist_join_strings(v2->known_flags, ":", 0, NULL);
-  test_streq(cp, "Authority:Exit:Fast:Guard:MadeOfCheese:MadeOfTin:"
-             "Running:Stable:V2Dir:Valid");
-  tor_free(cp);
-  test_eq(4, smartlist_len(con->voters)); /*3 voters, 1 legacy key.*/
-  /* The voter id digests should be in this order. */
-  test_assert(memcmp(cert2->cache_info.identity_digest,
-                     cert1->cache_info.identity_digest,DIGEST_LEN)<0);
-  test_assert(memcmp(cert1->cache_info.identity_digest,
-                     cert3->cache_info.identity_digest,DIGEST_LEN)<0);
-  test_same_voter(smartlist_get(con->voters, 1),
-                  smartlist_get(v2->voters, 0));
-  test_same_voter(smartlist_get(con->voters, 2),
-                  smartlist_get(v1->voters, 0));
-  test_same_voter(smartlist_get(con->voters, 3),
-                  smartlist_get(v3->voters, 0));
-
-  test_assert(!con->cert);
-  test_eq(2, smartlist_len(con->routerstatus_list));
-  /* There should be two listed routers: one with identity 3, one with
-   * identity 5. */
-  /* This one showed up in 2 digests. */
-  rs = smartlist_get(con->routerstatus_list, 0);
-  test_memeq(rs->identity_digest,
-             "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3",
-             DIGEST_LEN);
-  test_memeq(rs->descriptor_digest, "NNNNNNNNNNNNNNNNNNNN", DIGEST_LEN);
-  test_assert(!rs->is_authority);
-  test_assert(!rs->is_exit);
-  test_assert(!rs->is_fast);
-  test_assert(!rs->is_possible_guard);
-  test_assert(!rs->is_stable);
-  test_assert(rs->is_running); /* If it wasn't running it wouldn't be here */
-  test_assert(!rs->is_v2_dir);
-  test_assert(!rs->is_valid);
-  test_assert(!rs->is_named);
-  /* XXXX check version */
-
-  rs = smartlist_get(con->routerstatus_list, 1);
-  /* This one showed up in 3 digests. Twice with ID 'M', once with 'Z'.  */
-  test_memeq(rs->identity_digest,
-             "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5",
-             DIGEST_LEN);
-  test_streq(rs->nickname, "router1");
-  test_memeq(rs->descriptor_digest, "MMMMMMMMMMMMMMMMMMMM", DIGEST_LEN);
-  test_eq(rs->published_on, now-1000);
-  test_eq(rs->addr, 0x99009901);
-  test_eq(rs->or_port, 443);
-  test_eq(rs->dir_port, 0);
-  test_assert(!rs->is_authority);
-  test_assert(rs->is_exit);
-  test_assert(rs->is_fast);
-  test_assert(rs->is_possible_guard);
-  test_assert(rs->is_stable);
-  test_assert(rs->is_running);
-  test_assert(rs->is_v2_dir);
-  test_assert(rs->is_valid);
-  test_assert(!rs->is_named);
-  /* XXXX check version */
-  // x231
-  // x213
-
-  /* Check signatures.  the first voter is a pseudo-entry with a legacy key.
-   * The second one hasn't signed.  The fourth one has signed: validate it. */
-  voter = smartlist_get(con->voters, 1);
-  test_assert(!voter->signature);
-  test_assert(!voter->good_signature);
-  test_assert(!voter->bad_signature);
-
-  voter = smartlist_get(con->voters, 3);
-  test_assert(voter->signature);
-  test_assert(!voter->good_signature);
-  test_assert(!voter->bad_signature);
-  test_assert(!networkstatus_check_voter_signature(con,
-                                               smartlist_get(con->voters, 3),
-                                               cert3));
-  test_assert(voter->signature);
-  test_assert(voter->good_signature);
-  test_assert(!voter->bad_signature);
-
-  {
-    const char *msg=NULL;
-    /* Compute the other two signed consensuses. */
-    smartlist_shuffle(votes);
-    consensus_text2 = networkstatus_compute_consensus(votes, 3,
-                                                      cert2->identity_key,
-                                                      sign_skey_2, NULL,NULL);
-    smartlist_shuffle(votes);
-    consensus_text3 = networkstatus_compute_consensus(votes, 3,
-                                                      cert1->identity_key,
-                                                      sign_skey_1, NULL,NULL);
-    test_assert(consensus_text2);
-    test_assert(consensus_text3);
-    con2 = networkstatus_parse_vote_from_string(consensus_text2, NULL,
-                                                NS_TYPE_CONSENSUS);
-    con3 = networkstatus_parse_vote_from_string(consensus_text3, NULL,
-                                                NS_TYPE_CONSENSUS);
-    test_assert(con2);
-    test_assert(con3);
-
-    /* All three should have the same digest. */
-    test_memeq(con->networkstatus_digest, con2->networkstatus_digest,
-               DIGEST_LEN);
-    test_memeq(con->networkstatus_digest, con3->networkstatus_digest,
-               DIGEST_LEN);
-
-    /* Extract a detached signature from con3. */
-    detached_text1 = networkstatus_get_detached_signatures(con3);
-    tor_assert(detached_text1);
-    /* Try to parse it. */
-    dsig1 = networkstatus_parse_detached_signatures(detached_text1, NULL);
-    tor_assert(dsig1);
-
-    /* Are parsed values as expected? */
-    test_eq(dsig1->valid_after, con3->valid_after);
-    test_eq(dsig1->fresh_until, con3->fresh_until);
-    test_eq(dsig1->valid_until, con3->valid_until);
-    test_memeq(dsig1->networkstatus_digest, con3->networkstatus_digest,
-               DIGEST_LEN);
-    test_eq(1, smartlist_len(dsig1->signatures));
-    voter = smartlist_get(dsig1->signatures, 0);
-    test_memeq(voter->identity_digest, cert1->cache_info.identity_digest,
-               DIGEST_LEN);
-
-    /* Try adding it to con2. */
-    detached_text2 = networkstatus_get_detached_signatures(con2);
-    test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, &msg));
-    tor_free(detached_text2);
-    detached_text2 = networkstatus_get_detached_signatures(con2);
-    //printf("\n<%s>\n", detached_text2);
-    dsig2 = networkstatus_parse_detached_signatures(detached_text2, NULL);
-    test_assert(dsig2);
-    /*
-    printf("\n");
-    SMARTLIST_FOREACH(dsig2->signatures, networkstatus_voter_info_t *, vi, {
-        char hd[64];
-        base16_encode(hd, sizeof(hd), vi->identity_digest, DIGEST_LEN);
-        printf("%s\n", hd);
-      });
-    */
-    test_eq(2, smartlist_len(dsig2->signatures));
-
-    /* Try adding to con2 twice; verify that nothing changes. */
-    test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, &msg));
-
-    /* Add to con. */
-    test_eq(2, networkstatus_add_detached_signatures(con, dsig2, &msg));
-    /* Check signatures */
-    test_assert(!networkstatus_check_voter_signature(con,
-                                               smartlist_get(con->voters, 1),
-                                               cert2));
-    test_assert(!networkstatus_check_voter_signature(con,
-                                               smartlist_get(con->voters, 2),
-                                               cert1));
-
-  }
-
- done:
-  smartlist_free(votes);
-  tor_free(v1_text);
-  tor_free(v2_text);
-  tor_free(v3_text);
-  tor_free(consensus_text);
-
-  if (vote)
-    networkstatus_vote_free(vote);
-  if (v1)
-    networkstatus_vote_free(v1);
-  if (v2)
-    networkstatus_vote_free(v2);
-  if (v3)
-    networkstatus_vote_free(v3);
-  if (con)
-    networkstatus_vote_free(con);
-  if (sign_skey_1)
-    crypto_free_pk_env(sign_skey_1);
-  if (sign_skey_2)
-    crypto_free_pk_env(sign_skey_2);
-  if (sign_skey_3)
-    crypto_free_pk_env(sign_skey_3);
-  if (sign_skey_leg1)
-    crypto_free_pk_env(sign_skey_leg1);
-  if (cert1)
-    authority_cert_free(cert1);
-  if (cert2)
-    authority_cert_free(cert2);
-  if (cert3)
-    authority_cert_free(cert3);
-
-  tor_free(consensus_text2);
-  tor_free(consensus_text3);
-  tor_free(detached_text1);
-  tor_free(detached_text2);
-  if (con2)
-    networkstatus_vote_free(con2);
-  if (con3)
-    networkstatus_vote_free(con3);
-  if (dsig1)
-    ns_detached_signatures_free(dsig1);
-  if (dsig2)
-    ns_detached_signatures_free(dsig2);
-}
-
-/** Helper: Parse the exit policy string in <b>policy_str</b>, and make sure
- * that policies_summarize() produces the string <b>expected_summary</b> from
- * it. */
-static void
-test_policy_summary_helper(const char *policy_str,
-                           const char *expected_summary)
-{
-  config_line_t line;
-  smartlist_t *policy = smartlist_create();
-  char *summary = NULL;
-  int r;
-
-  line.key = (char*)"foo";
-  line.value = (char *)policy_str;
-  line.next = NULL;
-
-  r = policies_parse_exit_policy(&line, &policy, 0, NULL);
-  test_eq(r, 0);
-  summary = policy_summarize(policy);
-
-  test_assert(summary != NULL);
-  test_streq(summary, expected_summary);
-
- done:
-  tor_free(summary);
-  if (policy)
-    addr_policy_list_free(policy);
-}
-
-/** Run unit tests for generating summary lines of exit policies */
-static void
-test_policies(void)
-{
-  int i;
-  smartlist_t *policy = NULL, *policy2 = NULL;
-  addr_policy_t *p;
-  tor_addr_t tar;
-  config_line_t line;
-  smartlist_t *sm = NULL;
-  char *policy_str = NULL;
-
-  policy = smartlist_create();
-
-  p = router_parse_addr_policy_item_from_string("reject 192.168.0.0/16:*",-1);
-  test_assert(p != NULL);
-  test_eq(ADDR_POLICY_REJECT, p->policy_type);
-  tor_addr_from_ipv4h(&tar, 0xc0a80000u);
-  test_eq(0, tor_addr_compare(&p->addr, &tar, CMP_EXACT));
-  test_eq(16, p->maskbits);
-  test_eq(1, p->prt_min);
-  test_eq(65535, p->prt_max);
-
-  smartlist_add(policy, p);
-
-  test_assert(ADDR_POLICY_ACCEPTED ==
-          compare_addr_to_addr_policy(0x01020304u, 2, policy));
-  test_assert(ADDR_POLICY_PROBABLY_ACCEPTED ==
-          compare_addr_to_addr_policy(0, 2, policy));
-  test_assert(ADDR_POLICY_REJECTED ==
-          compare_addr_to_addr_policy(0xc0a80102, 2, policy));
-
-  policy2 = NULL;
-  test_assert(0 == policies_parse_exit_policy(NULL, &policy2, 1, NULL));
-  test_assert(policy2);
-
-  test_assert(!exit_policy_is_general_exit(policy));
-  test_assert(exit_policy_is_general_exit(policy2));
-  test_assert(!exit_policy_is_general_exit(NULL));
-
-  test_assert(cmp_addr_policies(policy, policy2));
-  test_assert(cmp_addr_policies(policy, NULL));
-  test_assert(!cmp_addr_policies(policy2, policy2));
-  test_assert(!cmp_addr_policies(NULL, NULL));
-
-  test_assert(!policy_is_reject_star(policy2));
-  test_assert(policy_is_reject_star(policy));
-  test_assert(policy_is_reject_star(NULL));
-
-  addr_policy_list_free(policy);
-  policy = NULL;
-
-  /* make sure compacting logic works. */
-  policy = NULL;
-  line.key = (char*)"foo";
-  line.value = (char*)"accept *:80,reject private:*,reject *:*";
-  line.next = NULL;
-  test_assert(0 == policies_parse_exit_policy(&line, &policy, 0, NULL));
-  test_assert(policy);
-  //test_streq(policy->string, "accept *:80");
-  //test_streq(policy->next->string, "reject *:*");
-  test_eq(smartlist_len(policy), 2);
-
-  /* test policy summaries */
-  /* check if we properly ignore private IP addresses */
-  test_policy_summary_helper("reject 192.168.0.0/16:*,"
-                             "reject 0.0.0.0/8:*,"
-                             "reject 10.0.0.0/8:*,"
-                             "accept *:10-30,"
-                             "accept *:90,"
-                             "reject *:*",
-                             "accept 10-30,90");
-  /* check all accept policies, and proper counting of rejects */
-  test_policy_summary_helper("reject 11.0.0.0/9:80,"
-                             "reject 12.0.0.0/9:80,"
-                             "reject 13.0.0.0/9:80,"
-                             "reject 14.0.0.0/9:80,"
-                             "accept *:*", "accept 1-65535");
-  test_policy_summary_helper("reject 11.0.0.0/9:80,"
-                             "reject 12.0.0.0/9:80,"
-                             "reject 13.0.0.0/9:80,"
-                             "reject 14.0.0.0/9:80,"
-                             "reject 15.0.0.0:81,"
-                             "accept *:*", "accept 1-65535");
-  test_policy_summary_helper("reject 11.0.0.0/9:80,"
-                             "reject 12.0.0.0/9:80,"
-                             "reject 13.0.0.0/9:80,"
-                             "reject 14.0.0.0/9:80,"
-                             "reject 15.0.0.0:80,"
-                             "accept *:*",
-                             "reject 80");
-  /* no exits */
-  test_policy_summary_helper("accept 11.0.0.0/9:80,"
-                             "reject *:*",
-                             "reject 1-65535");
-  /* port merging */
-  test_policy_summary_helper("accept *:80,"
-                             "accept *:81,"
-                             "accept *:100-110,"
-                             "accept *:111,"
-                             "reject *:*",
-                             "accept 80-81,100-111");
-  /* border ports */
-  test_policy_summary_helper("accept *:1,"
-                             "accept *:3,"
-                             "accept *:65535,"
-                             "reject *:*",
-                             "accept 1,3,65535");
-  /* holes */
-  test_policy_summary_helper("accept *:1,"
-                             "accept *:3,"
-                             "accept *:5,"
-                             "accept *:7,"
-                             "reject *:*",
-                             "accept 1,3,5,7");
-  test_policy_summary_helper("reject *:1,"
-                             "reject *:3,"
-                             "reject *:5,"
-                             "reject *:7,"
-                             "accept *:*",
-                             "reject 1,3,5,7");
-
-  /* truncation ports */
-  sm = smartlist_create();
-  for (i=1; i<2000; i+=2) {
-    char buf[POLICY_BUF_LEN];
-    tor_snprintf(buf, sizeof(buf), "reject *:%d", i);
-    smartlist_add(sm, tor_strdup(buf));
-  }
-  smartlist_add(sm, tor_strdup("accept *:*"));
-  policy_str = smartlist_join_strings(sm, ",", 0, NULL);
-  test_policy_summary_helper( policy_str,
-    "accept 2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,"
-    "46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,80,82,84,86,88,90,"
-    "92,94,96,98,100,102,104,106,108,110,112,114,116,118,120,122,124,126,128,"
-    "130,132,134,136,138,140,142,144,146,148,150,152,154,156,158,160,162,164,"
-    "166,168,170,172,174,176,178,180,182,184,186,188,190,192,194,196,198,200,"
-    "202,204,206,208,210,212,214,216,218,220,222,224,226,228,230,232,234,236,"
-    "238,240,242,244,246,248,250,252,254,256,258,260,262,264,266,268,270,272,"
-    "274,276,278,280,282,284,286,288,290,292,294,296,298,300,302,304,306,308,"
-    "310,312,314,316,318,320,322,324,326,328,330,332,334,336,338,340,342,344,"
-    "346,348,350,352,354,356,358,360,362,364,366,368,370,372,374,376,378,380,"
-    "382,384,386,388,390,392,394,396,398,400,402,404,406,408,410,412,414,416,"
-    "418,420,422,424,426,428,430,432,434,436,438,440,442,444,446,448,450,452,"
-    "454,456,458,460,462,464,466,468,470,472,474,476,478,480,482,484,486,488,"
-    "490,492,494,496,498,500,502,504,506,508,510,512,514,516,518,520,522");
-
- done:
-  if (policy)
-    addr_policy_list_free(policy);
-  if (policy2)
-    addr_policy_list_free(policy2);
-  tor_free(policy_str);
-  if (sm) {
-    SMARTLIST_FOREACH(sm, char *, s, tor_free(s));
-    smartlist_free(sm);
-  }
-}
-
-/** Run AES performance benchmarks. */
-static void
-bench_aes(void)
-{
-  int len, i;
-  char *b1, *b2;
-  crypto_cipher_env_t *c;
-  struct timeval start, end;
-  const int iters = 100000;
-  uint64_t nsec;
-  c = crypto_new_cipher_env();
-  crypto_cipher_generate_key(c);
-  crypto_cipher_encrypt_init_cipher(c);
-  for (len = 1; len <= 8192; len *= 2) {
-    b1 = tor_malloc_zero(len);
-    b2 = tor_malloc_zero(len);
-    tor_gettimeofday(&start);
-    for (i = 0; i < iters; ++i) {
-      crypto_cipher_encrypt(c, b1, b2, len);
-    }
-    tor_gettimeofday(&end);
-    tor_free(b1);
-    tor_free(b2);
-    nsec = (uint64_t) tv_udiff(&start,&end);
-    nsec *= 1000;
-    nsec /= (iters*len);
-    printf("%d bytes: "U64_FORMAT" nsec per byte\n", len,
-           U64_PRINTF_ARG(nsec));
-  }
-  crypto_free_cipher_env(c);
-}
-
-/** Run digestmap_t performance benchmarks. */
-static void
-bench_dmap(void)
-{
-  smartlist_t *sl = smartlist_create();
-  smartlist_t *sl2 = smartlist_create();
-  struct timeval start, end, pt2, pt3, pt4;
-  const int iters = 10000;
-  const int elts = 4000;
-  const int fpostests = 1000000;
-  char d[20];
-  int i,n=0, fp = 0;
-  digestmap_t *dm = digestmap_new();
-  digestset_t *ds = digestset_new(elts);
-
-  for (i = 0; i < elts; ++i) {
-    crypto_rand(d, 20);
-    smartlist_add(sl, tor_memdup(d, 20));
-  }
-  for (i = 0; i < elts; ++i) {
-    crypto_rand(d, 20);
-    smartlist_add(sl2, tor_memdup(d, 20));
-  }
-  printf("nbits=%d\n", ds->mask+1);
-
-  tor_gettimeofday(&start);
-  for (i = 0; i < iters; ++i) {
-    SMARTLIST_FOREACH(sl, const char *, cp, digestmap_set(dm, cp, (void*)1));
-  }
-  tor_gettimeofday(&pt2);
-  for (i = 0; i < iters; ++i) {
-    SMARTLIST_FOREACH(sl, const char *, cp, digestmap_get(dm, cp));
-    SMARTLIST_FOREACH(sl2, const char *, cp, digestmap_get(dm, cp));
-  }
-  tor_gettimeofday(&pt3);
-  for (i = 0; i < iters; ++i) {
-    SMARTLIST_FOREACH(sl, const char *, cp, digestset_add(ds, cp));
-  }
-  tor_gettimeofday(&pt4);
-  for (i = 0; i < iters; ++i) {
-    SMARTLIST_FOREACH(sl, const char *, cp, n += digestset_isin(ds, cp));
-    SMARTLIST_FOREACH(sl2, const char *, cp, n += digestset_isin(ds, cp));
-  }
-  tor_gettimeofday(&end);
-
-  for (i = 0; i < fpostests; ++i) {
-    crypto_rand(d, 20);
-    if (digestset_isin(ds, d)) ++fp;
-  }
-
-  printf("%ld\n",(unsigned long)tv_udiff(&start, &pt2));
-  printf("%ld\n",(unsigned long)tv_udiff(&pt2, &pt3));
-  printf("%ld\n",(unsigned long)tv_udiff(&pt3, &pt4));
-  printf("%ld\n",(unsigned long)tv_udiff(&pt4, &end));
-  printf("-- %d\n", n);
-  printf("++ %f\n", fp/(double)fpostests);
-  digestmap_free(dm, NULL);
-  digestset_free(ds);
-  SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));
-  SMARTLIST_FOREACH(sl2, char *, cp, tor_free(cp));
-  smartlist_free(sl);
-  smartlist_free(sl2);
-}
-
-/** Run unittests for memory pool allocator */
-static void
-test_util_mempool(void)
-{
-  mp_pool_t *pool = NULL;
-  smartlist_t *allocated = NULL;
-  int i;
-
-  pool = mp_pool_new(1, 100);
-  test_assert(pool);
-  test_assert(pool->new_chunk_capacity >= 100);
-  test_assert(pool->item_alloc_size >= sizeof(void*)+1);
-  mp_pool_destroy(pool);
-  pool = NULL;
-
-  pool = mp_pool_new(241, 2500);
-  test_assert(pool);
-  test_assert(pool->new_chunk_capacity >= 10);
-  test_assert(pool->item_alloc_size >= sizeof(void*)+241);
-  test_eq(pool->item_alloc_size & 0x03, 0);
-  test_assert(pool->new_chunk_capacity < 60);
-
-  allocated = smartlist_create();
-  for (i = 0; i < 20000; ++i) {
-    if (smartlist_len(allocated) < 20 || crypto_rand_int(2)) {
-      void *m = mp_pool_get(pool);
-      memset(m, 0x09, 241);
-      smartlist_add(allocated, m);
-      //printf("%d: %p\n", i, m);
-      //mp_pool_assert_ok(pool);
-    } else {
-      int idx = crypto_rand_int(smartlist_len(allocated));
-      void *m = smartlist_get(allocated, idx);
-      //printf("%d: free %p\n", i, m);
-      smartlist_del(allocated, idx);
-      mp_pool_release(m);
-      //mp_pool_assert_ok(pool);
-    }
-    if (crypto_rand_int(777)==0)
-      mp_pool_clean(pool, 1, 1);
-
-    if (i % 777)
-      mp_pool_assert_ok(pool);
-  }
-
- done:
-  if (allocated) {
-    SMARTLIST_FOREACH(allocated, void *, m, mp_pool_release(m));
-    mp_pool_assert_ok(pool);
-    mp_pool_clean(pool, 0, 0);
-    mp_pool_assert_ok(pool);
-    smartlist_free(allocated);
-  }
-
-  if (pool)
-    mp_pool_destroy(pool);
-}
-
-/** Run unittests for memory area allocator */
-static void
-test_util_memarea(void)
-{
-  memarea_t *area = memarea_new();
-  char *p1, *p2, *p3, *p1_orig;
-  void *malloced_ptr = NULL;
-  int i;
-
-  test_assert(area);
-
-  p1_orig = p1 = memarea_alloc(area,64);
-  p2 = memarea_alloc_zero(area,52);
-  p3 = memarea_alloc(area,11);
-
-  test_assert(memarea_owns_ptr(area, p1));
-  test_assert(memarea_owns_ptr(area, p2));
-  test_assert(memarea_owns_ptr(area, p3));
-  /* Make sure we left enough space. */
-  test_assert(p1+64 <= p2);
-  test_assert(p2+52 <= p3);
-  /* Make sure we aligned. */
-  test_eq(((uintptr_t)p1) % sizeof(void*), 0);
-  test_eq(((uintptr_t)p2) % sizeof(void*), 0);
-  test_eq(((uintptr_t)p3) % sizeof(void*), 0);
-  test_assert(!memarea_owns_ptr(area, p3+8192));
-  test_assert(!memarea_owns_ptr(area, p3+30));
-  test_assert(tor_mem_is_zero(p2, 52));
-  /* Make sure we don't overalign. */
-  p1 = memarea_alloc(area, 1);
-  p2 = memarea_alloc(area, 1);
-  test_eq(p1+sizeof(void*), p2);
-  {
-    malloced_ptr = tor_malloc(64);
-    test_assert(!memarea_owns_ptr(area, malloced_ptr));
-    tor_free(malloced_ptr);
-  }
-
-  /* memarea_memdup */
-  {
-    malloced_ptr = tor_malloc(64);
-    crypto_rand((char*)malloced_ptr, 64);
-    p1 = memarea_memdup(area, malloced_ptr, 64);
-    test_assert(p1 != malloced_ptr);
-    test_memeq(p1, malloced_ptr, 64);
-    tor_free(malloced_ptr);
-  }
-
-  /* memarea_strdup. */
-  p1 = memarea_strdup(area,"");
-  p2 = memarea_strdup(area, "abcd");
-  test_assert(p1);
-  test_assert(p2);
-  test_streq(p1, "");
-  test_streq(p2, "abcd");
-
-  /* memarea_strndup. */
-  {
-    const char *s = "Ad ogni porta batte la morte e grida: il nome!";
-    /* (From Turandot, act 3.) */
-    size_t len = strlen(s);
-    p1 = memarea_strndup(area, s, 1000);
-    p2 = memarea_strndup(area, s, 10);
-    test_streq(p1, s);
-    test_assert(p2 >= p1 + len + 1);
-    test_memeq(s, p2, 10);
-    test_eq(p2[10], '\0');
-    p3 = memarea_strndup(area, s, len);
-    test_streq(p3, s);
-    p3 = memarea_strndup(area, s, len-1);
-    test_memeq(s, p3, len-1);
-    test_eq(p3[len-1], '\0');
-  }
-
-  memarea_clear(area);
-  p1 = memarea_alloc(area, 1);
-  test_eq(p1, p1_orig);
-  memarea_clear(area);
-
-  /* Check for running over an area's size. */
-  for (i = 0; i < 512; ++i) {
-    p1 = memarea_alloc(area, crypto_rand_int(5)+1);
-    test_assert(memarea_owns_ptr(area, p1));
-  }
-  memarea_assert_ok(area);
-  /* Make sure we can allocate a too-big object. */
-  p1 = memarea_alloc_zero(area, 9000);
-  p2 = memarea_alloc_zero(area, 16);
-  test_assert(memarea_owns_ptr(area, p1));
-  test_assert(memarea_owns_ptr(area, p2));
-
- done:
-  memarea_drop_all(area);
-  tor_free(malloced_ptr);
-}
-
-/** Run unit tests for utility functions to get file names relative to
- * the data directory. */
-static void
-test_util_datadir(void)
-{
-  char buf[1024];
-  char *f = NULL;
-
-  f = get_datadir_fname(NULL);
-  test_streq(f, temp_dir);
-  tor_free(f);
-  f = get_datadir_fname("state");
-  tor_snprintf(buf, sizeof(buf), "%s"PATH_SEPARATOR"state", temp_dir);
-  test_streq(f, buf);
-  tor_free(f);
-  f = get_datadir_fname2("cache", "thingy");
-  tor_snprintf(buf, sizeof(buf),
-               "%s"PATH_SEPARATOR"cache"PATH_SEPARATOR"thingy", temp_dir);
-  test_streq(f, buf);
-  tor_free(f);
-  f = get_datadir_fname2_suffix("cache", "thingy", ".foo");
-  tor_snprintf(buf, sizeof(buf),
-               "%s"PATH_SEPARATOR"cache"PATH_SEPARATOR"thingy.foo", temp_dir);
-  test_streq(f, buf);
-  tor_free(f);
-  f = get_datadir_fname_suffix("cache", ".foo");
-  tor_snprintf(buf, sizeof(buf), "%s"PATH_SEPARATOR"cache.foo",
-               temp_dir);
-  test_streq(f, buf);
-
- done:
-  tor_free(f);
-}
-
-static void
-test_util_strtok(void)
-{
-  char buf[128];
-  char buf2[128];
-  char *cp1, *cp2;
-  strlcpy(buf, "Graved on the dark in gestures of descent", sizeof(buf));
-  strlcpy(buf2, "they.seemed;their!own;most.perfect;monument", sizeof(buf2));
-  /*  -- "Year's End", Richard Wilbur */
-
-  test_streq("Graved", tor_strtok_r_impl(buf, " ", &cp1));
-  test_streq("they", tor_strtok_r_impl(buf2, ".!..;!", &cp2));
-#define S1() tor_strtok_r_impl(NULL, " ", &cp1)
-#define S2() tor_strtok_r_impl(NULL, ".!..;!", &cp2)
-  test_streq("on", S1());
-  test_streq("the", S1());
-  test_streq("dark", S1());
-  test_streq("seemed", S2());
-  test_streq("their", S2());
-  test_streq("own", S2());
-  test_streq("in", S1());
-  test_streq("gestures", S1());
-  test_streq("of", S1());
-  test_streq("most", S2());
-  test_streq("perfect", S2());
-  test_streq("descent", S1());
-  test_streq("monument", S2());
-  test_assert(NULL == S1());
-  test_assert(NULL == S2());
- done:
-  ;
-}
-
-/** Test AES-CTR encryption and decryption with IV. */
-static void
-test_crypto_aes_iv(void)
-{
-  crypto_cipher_env_t *cipher;
-  char *plain, *encrypted1, *encrypted2, *decrypted1, *decrypted2;
-  char plain_1[1], plain_15[15], plain_16[16], plain_17[17];
-  char key1[16], key2[16];
-  ssize_t encrypted_size, decrypted_size;
-
-  plain = tor_malloc(4095);
-  encrypted1 = tor_malloc(4095 + 1 + 16);
-  encrypted2 = tor_malloc(4095 + 1 + 16);
-  decrypted1 = tor_malloc(4095 + 1);
-  decrypted2 = tor_malloc(4095 + 1);
-
-  crypto_rand(plain, 4095);
-  crypto_rand(key1, 16);
-  crypto_rand(key2, 16);
-  crypto_rand(plain_1, 1);
-  crypto_rand(plain_15, 15);
-  crypto_rand(plain_16, 16);
-  crypto_rand(plain_17, 17);
-  key1[0] = key2[0] + 128; /* Make sure that contents are different. */
-  /* Encrypt and decrypt with the same key. */
-  cipher = crypto_create_init_cipher(key1, 1);
-  encrypted_size = crypto_cipher_encrypt_with_iv(cipher, encrypted1, 16 + 4095,
-                                                 plain, 4095);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(encrypted_size, 16 + 4095);
-  tor_assert(encrypted_size > 0); /* This is obviously true, since 4111 is
-                                   * greater than 0, but its truth is not
-                                   * obvious to all analysis tools. */
-  cipher = crypto_create_init_cipher(key1, 0);
-  decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 4095,
-                                             encrypted1, encrypted_size);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(decrypted_size, 4095);
-  tor_assert(decrypted_size > 0);
-  test_memeq(plain, decrypted1, 4095);
-  /* Encrypt a second time (with a new random initialization vector). */
-  cipher = crypto_create_init_cipher(key1, 1);
-  encrypted_size = crypto_cipher_encrypt_with_iv(cipher, encrypted2, 16 + 4095,
-                                             plain, 4095);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(encrypted_size, 16 + 4095);
-  tor_assert(encrypted_size > 0);
-  cipher = crypto_create_init_cipher(key1, 0);
-  decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted2, 4095,
-                                             encrypted2, encrypted_size);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(decrypted_size, 4095);
-  tor_assert(decrypted_size > 0);
-  test_memeq(plain, decrypted2, 4095);
-  test_memneq(encrypted1, encrypted2, encrypted_size);
-  /* Decrypt with the wrong key. */
-  cipher = crypto_create_init_cipher(key2, 0);
-  decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted2, 4095,
-                                             encrypted1, encrypted_size);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_memneq(plain, decrypted2, encrypted_size);
-  /* Alter the initialization vector. */
-  encrypted1[0] += 42;
-  cipher = crypto_create_init_cipher(key1, 0);
-  decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 4095,
-                                             encrypted1, encrypted_size);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_memneq(plain, decrypted2, 4095);
-  /* Special length case: 1. */
-  cipher = crypto_create_init_cipher(key1, 1);
-  encrypted_size = crypto_cipher_encrypt_with_iv(cipher, encrypted1, 16 + 1,
-                                             plain_1, 1);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(encrypted_size, 16 + 1);
-  tor_assert(encrypted_size > 0);
-  cipher = crypto_create_init_cipher(key1, 0);
-  decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 1,
-                                             encrypted1, encrypted_size);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(decrypted_size, 1);
-  tor_assert(decrypted_size > 0);
-  test_memeq(plain_1, decrypted1, 1);
-  /* Special length case: 15. */
-  cipher = crypto_create_init_cipher(key1, 1);
-  encrypted_size = crypto_cipher_encrypt_with_iv(cipher, encrypted1, 16 + 15,
-                                             plain_15, 15);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(encrypted_size, 16 + 15);
-  tor_assert(encrypted_size > 0);
-  cipher = crypto_create_init_cipher(key1, 0);
-  decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 15,
-                                             encrypted1, encrypted_size);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(decrypted_size, 15);
-  tor_assert(decrypted_size > 0);
-  test_memeq(plain_15, decrypted1, 15);
-  /* Special length case: 16. */
-  cipher = crypto_create_init_cipher(key1, 1);
-  encrypted_size = crypto_cipher_encrypt_with_iv(cipher, encrypted1, 16 + 16,
-                                             plain_16, 16);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(encrypted_size, 16 + 16);
-  tor_assert(encrypted_size > 0);
-  cipher = crypto_create_init_cipher(key1, 0);
-  decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 16,
-                                             encrypted1, encrypted_size);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(decrypted_size, 16);
-  tor_assert(decrypted_size > 0);
-  test_memeq(plain_16, decrypted1, 16);
-  /* Special length case: 17. */
-  cipher = crypto_create_init_cipher(key1, 1);
-  encrypted_size = crypto_cipher_encrypt_with_iv(cipher, encrypted1, 16 + 17,
-                                             plain_17, 17);
-  crypto_free_cipher_env(cipher);
-  cipher = NULL;
-  test_eq(encrypted_size, 16 + 17);
-  tor_assert(encrypted_size > 0);
-  cipher = crypto_create_init_cipher(key1, 0);
-  decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 17,
-                                             encrypted1, encrypted_size);
-  test_eq(decrypted_size, 17);
-  tor_assert(decrypted_size > 0);
-  test_memeq(plain_17, decrypted1, 17);
-
- done:
-  /* Free memory. */
-  tor_free(plain);
-  tor_free(encrypted1);
-  tor_free(encrypted2);
-  tor_free(decrypted1);
-  tor_free(decrypted2);
-  if (cipher)
-    crypto_free_cipher_env(cipher);
-}
-
-/** Test base32 decoding. */
-static void
-test_crypto_base32_decode(void)
-{
-  char plain[60], encoded[96 + 1], decoded[60];
-  int res;
-  crypto_rand(plain, 60);
-  /* Encode and decode a random string. */
-  base32_encode(encoded, 96 + 1, plain, 60);
-  res = base32_decode(decoded, 60, encoded, 96);
-  test_eq(res, 0);
-  test_memeq(plain, decoded, 60);
-  /* Encode, uppercase, and decode a random string. */
-  base32_encode(encoded, 96 + 1, plain, 60);
-  tor_strupper(encoded);
-  res = base32_decode(decoded, 60, encoded, 96);
-  test_eq(res, 0);
-  test_memeq(plain, decoded, 60);
-  /* Change encoded string and decode. */
-  if (encoded[0] == 'A' || encoded[0] == 'a')
-    encoded[0] = 'B';
-  else
-    encoded[0] = 'A';
-  res = base32_decode(decoded, 60, encoded, 96);
-  test_eq(res, 0);
-  test_memneq(plain, decoded, 60);
-  /* Bad encodings. */
-  encoded[0] = '!';
-  res = base32_decode(decoded, 60, encoded, 96);
-  test_assert(res < 0);
-
- done:
-  ;
-}
-
-/** Test encoding and parsing of rendezvous service descriptors. */
-static void
-test_rend_fns(void)
-{
-  rend_service_descriptor_t *generated = NULL, *parsed = NULL;
-  char service_id[DIGEST_LEN];
-  char service_id_base32[REND_SERVICE_ID_LEN_BASE32+1];
-  const char *next_desc;
-  smartlist_t *descs = smartlist_create();
-  char computed_desc_id[DIGEST_LEN];
-  char parsed_desc_id[DIGEST_LEN];
-  crypto_pk_env_t *pk1 = NULL, *pk2 = NULL;
-  time_t now;
-  char *intro_points_encrypted = NULL;
-  size_t intro_points_size;
-  size_t encoded_size;
-  int i;
-  char address1[] = "fooaddress.onion";
-  char address2[] = "aaaaaaaaaaaaaaaa.onion";
-  char address3[] = "fooaddress.exit";
-  char address4[] = "www.torproject.org";
-
-  test_assert(BAD_HOSTNAME == parse_extended_hostname(address1, 1));
-  test_assert(ONION_HOSTNAME == parse_extended_hostname(address2, 1));
-  test_assert(EXIT_HOSTNAME == parse_extended_hostname(address3, 1));
-  test_assert(NORMAL_HOSTNAME == parse_extended_hostname(address4, 1));
-
-  pk1 = pk_generate(0);
-  pk2 = pk_generate(1);
-  generated = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  generated->pk = crypto_pk_dup_key(pk1);
-  crypto_pk_get_digest(generated->pk, service_id);
-  base32_encode(service_id_base32, REND_SERVICE_ID_LEN_BASE32+1,
-                service_id, REND_SERVICE_ID_LEN);
-  now = time(NULL);
-  generated->timestamp = now;
-  generated->version = 2;
-  generated->protocols = 42;
-  generated->intro_nodes = smartlist_create();
-
-  for (i = 0; i < 3; i++) {
-    rend_intro_point_t *intro = tor_malloc_zero(sizeof(rend_intro_point_t));
-    crypto_pk_env_t *okey = pk_generate(2 + i);
-    intro->extend_info = tor_malloc_zero(sizeof(extend_info_t));
-    intro->extend_info->onion_key = okey;
-    crypto_pk_get_digest(intro->extend_info->onion_key,
-                         intro->extend_info->identity_digest);
-    //crypto_rand(info->identity_digest, DIGEST_LEN); /* Would this work? */
-    intro->extend_info->nickname[0] = '$';
-    base16_encode(intro->extend_info->nickname + 1,
-                  sizeof(intro->extend_info->nickname) - 1,
-                  intro->extend_info->identity_digest, DIGEST_LEN);
-    /* Does not cover all IP addresses. */
-    tor_addr_from_ipv4h(&intro->extend_info->addr, crypto_rand_int(65536));
-    intro->extend_info->port = crypto_rand_int(65536);
-    intro->intro_key = crypto_pk_dup_key(pk2);
-    smartlist_add(generated->intro_nodes, intro);
-  }
-  test_assert(rend_encode_v2_descriptors(descs, generated, now, 0,
-                                         REND_NO_AUTH, NULL, NULL) > 0);
-  test_assert(rend_compute_v2_desc_id(computed_desc_id, service_id_base32,
-                                      NULL, now, 0) == 0);
-  test_memeq(((rend_encoded_v2_service_descriptor_t *)
-             smartlist_get(descs, 0))->desc_id, computed_desc_id, DIGEST_LEN);
-  test_assert(rend_parse_v2_service_descriptor(&parsed, parsed_desc_id,
-                                               &intro_points_encrypted,
-                                               &intro_points_size,
-                                               &encoded_size,
-                                               &next_desc,
-                                     ((rend_encoded_v2_service_descriptor_t *)
-                                     smartlist_get(descs, 0))->desc_str) == 0);
-  test_assert(parsed);
-  test_memeq(((rend_encoded_v2_service_descriptor_t *)
-             smartlist_get(descs, 0))->desc_id, parsed_desc_id, DIGEST_LEN);
-  test_eq(rend_parse_introduction_points(parsed, intro_points_encrypted,
-                                         intro_points_size), 3);
-  test_assert(!crypto_pk_cmp_keys(generated->pk, parsed->pk));
-  test_eq(parsed->timestamp, now);
-  test_eq(parsed->version, 2);
-  test_eq(parsed->protocols, 42);
-  test_eq(smartlist_len(parsed->intro_nodes), 3);
-  for (i = 0; i < smartlist_len(parsed->intro_nodes); i++) {
-    rend_intro_point_t *par_intro = smartlist_get(parsed->intro_nodes, i),
-      *gen_intro = smartlist_get(generated->intro_nodes, i);
-    extend_info_t *par_info = par_intro->extend_info;
-    extend_info_t *gen_info = gen_intro->extend_info;
-    test_assert(!crypto_pk_cmp_keys(gen_info->onion_key, par_info->onion_key));
-    test_memeq(gen_info->identity_digest, par_info->identity_digest,
-               DIGEST_LEN);
-    test_streq(gen_info->nickname, par_info->nickname);
-    test_assert(tor_addr_eq(&gen_info->addr, &par_info->addr));
-    test_eq(gen_info->port, par_info->port);
-  }
-
-  rend_service_descriptor_free(parsed);
-  rend_service_descriptor_free(generated);
-  parsed = generated = NULL;
-
- done:
-  if (descs) {
-    for (i = 0; i < smartlist_len(descs); i++)
-      rend_encoded_v2_service_descriptor_free(smartlist_get(descs, i));
-    smartlist_free(descs);
-  }
-  if (parsed)
-    rend_service_descriptor_free(parsed);
-  if (generated)
-    rend_service_descriptor_free(generated);
-  if (pk1)
-    crypto_free_pk_env(pk1);
-  if (pk2)
-    crypto_free_pk_env(pk2);
-  tor_free(intro_points_encrypted);
-}
-
-/** Run unit tests for GeoIP code. */
-static void
-test_geoip(void)
-{
-  int i, j;
-  time_t now = time(NULL);
-  char *s = NULL;
-
-  /* Populate the DB a bit.  Add these in order, since we can't do the final
-   * 'sort' step.  These aren't very good IP addresses, but they're perfectly
-   * fine uint32_t values. */
-  test_eq(0, geoip_parse_entry("10,50,AB"));
-  test_eq(0, geoip_parse_entry("52,90,XY"));
-  test_eq(0, geoip_parse_entry("95,100,AB"));
-  test_eq(0, geoip_parse_entry("\"105\",\"140\",\"ZZ\""));
-  test_eq(0, geoip_parse_entry("\"150\",\"190\",\"XY\""));
-  test_eq(0, geoip_parse_entry("\"200\",\"250\",\"AB\""));
-
-  /* We should have 3 countries: ab, xy, zz. */
-  test_eq(3, geoip_get_n_countries());
-  /* Make sure that country ID actually works. */
-#define NAMEFOR(x) geoip_get_country_name(geoip_get_country_by_ip(x))
-  test_streq("ab", NAMEFOR(32));
-  test_streq("??", NAMEFOR(5));
-  test_streq("??", NAMEFOR(51));
-  test_streq("xy", NAMEFOR(150));
-  test_streq("xy", NAMEFOR(190));
-  test_streq("??", NAMEFOR(2000));
-#undef NAMEFOR
-
-  get_options()->BridgeRelay = 1;
-  get_options()->BridgeRecordUsageByCountry = 1;
-  /* Put 9 observations in AB... */
-  for (i=32; i < 40; ++i)
-    geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-7200);
-  geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 225, now-7200);
-  /* and 3 observations in XY, several times. */
-  for (j=0; j < 10; ++j)
-    for (i=52; i < 55; ++i)
-      geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-3600);
-  /* and 17 observations in ZZ... */
-  for (i=110; i < 127; ++i)
-    geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now);
-  s = geoip_get_client_history(now+5*24*60*60, GEOIP_CLIENT_CONNECT);
-  test_assert(s);
-  test_streq("zz=24,ab=16,xy=8", s);
-  tor_free(s);
-
-  /* Now clear out all the AB observations. */
-  geoip_remove_old_clients(now-6000);
-  s = geoip_get_client_history(now+5*24*60*60, GEOIP_CLIENT_CONNECT);
-  test_assert(s);
-  test_streq("zz=24,xy=8", s);
-
- done:
-  tor_free(s);
-}
-
-/** For test_array. Declare an CLI-invocable off-by-default function in the
- * unit tests, with function name and user-visible name <b>x</b>*/
-#define DISABLED(x) { #x, x, 0, 0, 0 }
-/** For test_array. Declare an CLI-invocable unit test function, with function
- * name test_<b>x</b>(), and user-visible name <b>x</b> */
-#define ENT(x) { #x, test_ ## x, 0, 0, 1 }
-/** For test_array. Declare an CLI-invocable unit test function, with function
- * name test_<b>x</b>_<b>y</b>(), and user-visible name
- * <b>x</b>/<b>y</b>. This function will be treated as a subentry of <b>x</b>,
- * so that invoking <b>x</b> from the CLI invokes this test too. */
-#define SUBENT(x,y) { #x "/" #y, test_ ## x ## _ ## y, 1, 0, 1 }
-
-/** An array of functions and information for all the unit tests we can run. */
-static struct {
-  const char *test_name; /**< How does the user refer to this test from the
-                          * command line? */
-  void (*test_fn)(void); /**< What function is called to run this test? */
-  int is_subent; /**< Is this a subentry of a bigger set of related tests? */
-  int selected; /**< Are we planning to run this one? */
-  int is_default; /**< If the user doesn't say what tests they want, do they
-                   * get this function by default? */
-} test_array[] = {
-  ENT(buffers),
-  ENT(crypto),
-  SUBENT(crypto, rng),
-  SUBENT(crypto, aes),
-  SUBENT(crypto, sha),
-  SUBENT(crypto, pk),
-  SUBENT(crypto, dh),
-  SUBENT(crypto, s2k),
-  SUBENT(crypto, aes_iv),
-  SUBENT(crypto, base32_decode),
-  ENT(util),
-  SUBENT(util, ip6_helpers),
-  SUBENT(util, gzip),
-  SUBENT(util, datadir),
-  SUBENT(util, smartlist_basic),
-  SUBENT(util, smartlist_strings),
-  SUBENT(util, smartlist_overlap),
-  SUBENT(util, smartlist_digests),
-  SUBENT(util, smartlist_join),
-  SUBENT(util, bitarray),
-  SUBENT(util, digestset),
-  SUBENT(util, mempool),
-  SUBENT(util, memarea),
-  SUBENT(util, strmap),
-  SUBENT(util, control_formats),
-  SUBENT(util, pqueue),
-  SUBENT(util, mmap),
-  SUBENT(util, threads),
-  SUBENT(util, order_functions),
-  SUBENT(util, sscanf),
-  SUBENT(util, strtok),
-  ENT(onion_handshake),
-  ENT(dir_format),
-  ENT(dirutil),
-  SUBENT(dirutil, measured_bw),
-  ENT(v3_networkstatus),
-  ENT(policies),
-  ENT(rend_fns),
-  ENT(geoip),
-
-  DISABLED(bench_aes),
-  DISABLED(bench_dmap),
-  { NULL, NULL, 0, 0, 0 },
-};
-
-static void syntax(void) ATTR_NORETURN;
-
-/** Print a syntax usage message, and exit.*/
-static void
-syntax(void)
-{
-  int i;
-  printf("Syntax:\n"
-         "  test [-v|--verbose] [--warn|--notice|--info|--debug]\n"
-         "       [testname...]\n"
-         "Recognized tests are:\n");
-  for (i = 0; test_array[i].test_name; ++i) {
-    printf("   %s\n", test_array[i].test_name);
-  }
-
-  exit(0);
-}
-
-/** Main entry point for unit test code: parse the command line, and run
- * some unit tests. */
-int
-main(int c, char**v)
-{
-  or_options_t *options;
-  char *errmsg = NULL;
-  int i;
-  int verbose = 0, any_selected = 0;
-  int loglevel = LOG_ERR;
-
-#ifdef USE_DMALLOC
-  {
-    int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc, _tor_free);
-    tor_assert(r);
-  }
-#endif
-
-  update_approx_time(time(NULL));
-  options = options_new();
-  tor_threads_init();
-  init_logging();
-
-  for (i = 1; i < c; ++i) {
-    if (!strcmp(v[i], "-v") || !strcmp(v[i], "--verbose"))
-      verbose++;
-    else if (!strcmp(v[i], "--warn"))
-      loglevel = LOG_WARN;
-    else if (!strcmp(v[i], "--notice"))
-      loglevel = LOG_NOTICE;
-    else if (!strcmp(v[i], "--info"))
-      loglevel = LOG_INFO;
-    else if (!strcmp(v[i], "--debug"))
-      loglevel = LOG_DEBUG;
-    else if (!strcmp(v[i], "--help") || !strcmp(v[i], "-h") || v[i][0] == '-')
-      syntax();
-    else {
-      int j, found=0;
-      for (j = 0; test_array[j].test_name; ++j) {
-        if (!strcmp(v[i], test_array[j].test_name) ||
-            (test_array[j].is_subent &&
-             !strcmpstart(test_array[j].test_name, v[i]) &&
-             test_array[j].test_name[strlen(v[i])] == '/') ||
-            (v[i][0] == '=' && !strcmp(v[i]+1, test_array[j].test_name))) {
-          test_array[j].selected = 1;
-          any_selected = 1;
-          found = 1;
-        }
-      }
-      if (!found) {
-        printf("Unknown test: %s\n", v[i]);
-        syntax();
-      }
-    }
-  }
-
-  if (!any_selected) {
-    for (i = 0; test_array[i].test_name; ++i) {
-      test_array[i].selected = test_array[i].is_default;
-    }
-  }
-
-  {
-    log_severity_list_t s;
-    memset(&s, 0, sizeof(s));
-    set_log_severity_config(loglevel, LOG_ERR, &s);
-    add_stream_log(&s, "", fileno(stdout));
-  }
-
-  options->command = CMD_RUN_UNITTESTS;
-  crypto_global_init(0, NULL, NULL);
-  rep_hist_init();
-  network_init();
-  setup_directory();
-  options_init(options);
-  options->DataDirectory = tor_strdup(temp_dir);
-  options->EntryStatistics = 1;
-  if (set_options(options, &errmsg) < 0) {
-    printf("Failed to set initial options: %s\n", errmsg);
-    tor_free(errmsg);
-    return 1;
-  }
-
-  crypto_seed_rng(1);
-
-  atexit(remove_directory);
-
-  printf("Running Tor unit tests on %s\n", get_uname());
-
-  for (i = 0; test_array[i].test_name; ++i) {
-    if (!test_array[i].selected)
-      continue;
-    if (!test_array[i].is_subent) {
-      printf("\n============================== %s\n",test_array[i].test_name);
-    } else if (test_array[i].is_subent && verbose) {
-      printf("\n%s", test_array[i].test_name);
-    }
-    test_array[i].test_fn();
-  }
-  puts("");
-
-  free_pregenerated_keys();
-#ifdef USE_DMALLOC
-  tor_free_all(0);
-  dmalloc_log_unfreed();
-#endif
-
-  if (have_failed)
-    return 1;
-  else
-    return 0;
-}
-

Deleted: tor/trunk/src/or/test_data.c
===================================================================
--- tor/trunk/src/or/test_data.c	2009-09-25 17:06:41 UTC (rev 20669)
+++ tor/trunk/src/or/test_data.c	2009-09-25 17:51:03 UTC (rev 20670)
@@ -1,173 +0,0 @@
-/* Copyright 2001-2004 Roger Dingledine.
- * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2009, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-/** First of 3 example authority certificates for unit testing. */
-const char AUTHORITY_CERT_1[] =
-"dir-key-certificate-version 3\n"
-"fingerprint D867ACF56A9D229B35C25F0090BC9867E906BE69\n"
-"dir-key-published 2008-12-12 18:07:24\n"
-"dir-key-expires 2009-12-12 18:07:24\n"
-"dir-identity-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBigKCAYEAveMpKlw8oD1YqFqpJchuwSR82BDhutbqgHiez3QO9FmzOctJpV+Y\n"
-"mpTYIJLS/qC+4GBKFF1VK0C4SoBrS3zri0qdXdE+vBGcyrxrjMklpxoqSKRY2011\n"
-"4eqYPghKlo5RzuqteBclGCHyNxWjUJeRKDWgvh+U/gr2uYM6fRm5q0fCzg4aECE7\n"
-"VP6fDGZrMbQI8jHpiMSoC9gkUASNEa6chLInlnP8/H5qUEW4TB9CN/q095pefuwL\n"
-"P+F+1Nz5hnM7fa5XmeMB8iM4RriUmOQlLBZgpQBMpEfWMIPcR9F1Gh3MxERqqUcH\n"
-"tmij+IZdeXg9OkCXykcabaYIhZD3meErn9Tax4oA/THduLfgli9zM0ExwzH1OooN\n"
-"L8rIcJ+2eBo3bQiQUbdYW71sl9w7nSPtircbJUa1mUvWYLPWQxFliPiQSetgJLMj\n"
-"VQqtPmV2hvN2Xk3lLfJO50qMTK7w7Gsaw8UtV4YDM1Hcjp/hQaIB1xfwhXgl+eUU\n"
-"btUa4c+cUTjHAgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
-"dir-signing-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIGJAoGBALPSUInyuEu6NV3NjozplaniIEBzQXEjv1x9/+mqnwZABpYVmuy9A8nx\n"
-"eoyY3sZFsnYwNW/IZjAgG23pEmevu3F+L4myMjjaa6ORl3MgRYQ4gmuFqpefrGdm\n"
-"ywRCleh2JerkQ4VxOuq10dn/abITzLyaZzMw30KXWp5pxKXOLtxFAgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
-"dir-key-crosscert\n"
-"-----BEGIN ID SIGNATURE-----\n"
-"FTBJNR/Hlt4T53yUMp1r/QCSMCpkHJCbYBT0R0pvYqhqFfYN5qHRSICRXaFFImIF\n"
-"0DGWmwRza6DxPKNzkm5/b7I0de9zJW1jNNdQAQK5xppAtQcAafRdu8cBonnmh9KX\n"
-"k1NrAK/X00FYywju3yl/SxCn1GddVNkHYexEudmJMPM=\n"
-"-----END ID SIGNATURE-----\n"
-"dir-key-certification\n"
-"-----BEGIN SIGNATURE-----\n"
-"pjWguLFBfELZDc6DywL6Do21SCl7LcutfpM92MEn4WYeSNcTXNR6lRX7reOEJk4e\n"
-"NwEaMt+Hl7slgeR5wjnW3OmMmRPZK9bquNWbfD+sAOV9bRFZTpXIdleAQFPlwvMF\n"
-"z/Gzwspzn4i2Yh6hySShrctMmW8YL3OM8LsBXzBhp/rG2uHlsxmIsc13DA6HWt61\n"
-"ffY72uNE6KckDGsQ4wPGP9q69y6g+X+TNio1KPbsILbePv6EjbO+rS8FiS4njPlg\n"
-"SPYry1RaUvxzxTkswIzdE1tjJrUiqpbWlTGxrH9N4OszoLm45Pc784KLULrjKIoi\n"
-"Q+vRsGrcMBAa+kDowWU6H1ryKR7KOhzRTcf2uqLE/W3ezaRwmOG+ETmoVFwbhk2X\n"
-"OlbXEM9fWP+INvFkr6Z93VYL2jGkCjV7e3xXmre/Lb92fUcYi6t5dwzfV8gJnIoG\n"
-"eCHd0K8NrQK0ipVk/7zcPDKOPeo9Y5aj/f6X/pDHtb+Dd5sT+l82G/Tqy4DIYUYR\n"
-"-----END SIGNATURE-----\n";
-
-/** The private signing key for AUTHORITY_CERT_1 */
-const char AUTHORITY_SIGNKEY_1[] =
-"-----BEGIN RSA PRIVATE KEY-----\n"
-"MIICWwIBAAKBgQCz0lCJ8rhLujVdzY6M6ZWp4iBAc0FxI79cff/pqp8GQAaWFZrs\n"
-"vQPJ8XqMmN7GRbJ2MDVvyGYwIBtt6RJnr7txfi+JsjI42mujkZdzIEWEOIJrhaqX\n"
-"n6xnZssEQpXodiXq5EOFcTrqtdHZ/2myE8y8mmczMN9Cl1qeacSlzi7cRQIDAQAB\n"
-"AoGASpzUkDinIbzU0eQt5ugxEnliOnvYRpK3nzAk1JbYPyan1PSIAPz4qn1JBTeV\n"
-"EB3xS7r7ITO8uvFHkFZqLZ2sH1uE6e4sAytJGO+kyqnlkiDTPEXpcGe99j8PH1yj\n"
-"xUOrHRlAYWjG8NEkQi+APA+HZkswE3L/viFwR2AARoE2ac0CQQDsOLdNJa+mqn6N\n"
-"1L76nEl/YgXHtKUks+beOR3IgknKEjcsJJEUHyiu0wjbXZV6gTtyQvcAePglUUD1\n"
-"R2OkOOADAkEAwuCxvHEAPeQbVt8fSvxw74vqew6LITP2Utb1dQK0E26IRPF36BsJ\n"
-"buO/gqMZv6ALq+/KxpA/pUsApbgog9uUFwJAYvHCvbrKX1pM1iXFtP1fv86UMzlU\n"
-"bxI34t8zvXftZonIuGG8rxv6E3hr3k7NvNmCx/KKuZTyA9eMCPFVKEV2dwJACn8j\n"
-"06yagLrqphE6lEVop953cM1lvRIZcHjXm8fbfzhy6pO/C6d5KJnn1NeIKYQrXMV7\n"
-"vJpEc1jI3iQ/Omr3XQJAEBIt5MlP2wlrX9om7B+32XBygUssY3cw/bXybZrtSU0/\n"
-"Yx4lqK0ca5IkTp3HevwnlWaJgbaOTUspCVshzJBhDA==\n"
-"-----END RSA PRIVATE KEY-----\n";
-
-/** Second of 3 example authority certificates for unit testing. */
-const char AUTHORITY_CERT_2[] =
-"dir-key-certificate-version 3\n"
-"fingerprint 4D44AE0470B9E88FD4558EFEC82698FB33715400\n"
-"dir-key-published 2007-06-13 16:52:32\n"
-"dir-key-expires 2008-06-13 16:52:32\n"
-"dir-identity-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBigKCAYEAqukDwQRm1Oy1pPY+7GNRnRNFJzEVPUBfJwC4tBH19tkvdRQPuIGI\n"
-"2jiTy/rmZ6CLcl1G0oulSgxfKEX75QdptOasZu+rKUrRRSxx0QrXhs9a7up0rpXh\n"
-"13fw3mh1Vl/As3rJYF30Hjk01BTOJMxi/HY2y0ALQytFWjiMGY74A9Y6+uDcHkB2\n"
-"KflBjxIl8zpCsXsTTnUhN5kXqaOOnK46XaUShSpXsyOxTMJXuJEtgLz9XCyA8XjW\n"
-"d75QLHucEnlTqxUAdI5YSN2KIlIJiySCVnAorDpJey2mE9VncpHQWMCv/FPFdnSU\n"
-"EMMPUc4bBShcoNFf0mMJeV2sv+dBkgKAL0GLM19PuJIThJhfN/B6+YQTxw4HEpPV\n"
-"plfUqYRN0fYC+5hCTS6rroO/uCfDR7NBtoeDNm9dQrvjfk3b/Mywah1rdWNjnVqs\n"
-"tPJaz3fc/CVBOUUexhmyktgLuwSNEYIQilQ+BydkWN/4RObhV+YSV5BgekEDVaoS\n"
-"RHw4IbYBDHVxAgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
-"dir-signing-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIGJAoGBAOu3dgrQth3iqvi/UzfywaANw0bBUuMOBhnMBeiLEcRLneJHUJkVvrpR\n"
-"/EDQkdMov1e7CX6aqBKygVnbDNYjJ+bcQej8MKpuuW+zIknnz5lfnAVZO5uAmo3Y\n"
-"DpG574oQ2FFMdkWHSBloIRxSj/E4Jn1M2qJjElBXP0E33Ka/Noo7AgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
-"dir-key-certification\n"
-"-----BEGIN SIGNATURE-----\n"
-"Fv0Li68QUdAiChY3OklZOakHzwXAUfCzDNxkqe+HLC0n6ZECE9ZCvLVo69XmgVhH\n"
-"L5qYr2rxT6QpF+9yuOHbN9gWn8EsDcli06MlhX9TUt/IYVxHa/9tJwNoTfEw2w2D\n"
-"tyHhWm94IfOK7/Sea6jHnjckl80X+kk0ZNtAGs3/6fP4iltKNGXnvBwfgLpEgW7X\n"
-"NpDl0OLeDuA79zem2GogwQZQdoDbePByU0TJVx9jYi2Bzx2Nb2H0hRTPP6+dY0HQ\n"
-"MHb7yyyTQRad5iAUnExKhhyt22p7X3a6lgkAhq4YrNn/zVPkpnT2dzjsOydTHOW8\n"
-"2BQs33QlGNe095i47pJBDYsUgmJaXfqB/RG6dFg7jwIsc3/7dZcvcqfxY7wKcD/T\n"
-"wtogCIKxDvWbZn7f0hqYkT6uQC8Zom8bcnedmyzufOZCyA2SqQ2wvio6lznR4RIB\n"
-"a8qDHR0tPS9/VkqTPcvUWCZeY3UiDeWPjoK1nea1pz6DHDWglKPx86a0amjjayZQ\n"
-"-----END SIGNATURE-----\n";
-
-/** The private signing key for AUTHORITY_CERT_2 */
-const char AUTHORITY_SIGNKEY_2[] =
-"-----BEGIN RSA PRIVATE KEY-----\n"
-"MIICXgIBAAKBgQDrt3YK0LYd4qr4v1M38sGgDcNGwVLjDgYZzAXoixHES53iR1CZ\n"
-"Fb66UfxA0JHTKL9Xuwl+mqgSsoFZ2wzWIyfm3EHo/DCqbrlvsyJJ58+ZX5wFWTub\n"
-"gJqN2A6Rue+KENhRTHZFh0gZaCEcUo/xOCZ9TNqiYxJQVz9BN9ymvzaKOwIDAQAB\n"
-"AoGAJ+I9/ex8tCfTSA2PdisEKiHKBeHWNYb870Z/RW6qje1BhLUOZSixwfL3XLwt\n"
-"wG3nml+SZrKid69uhZaz4FPIf0tqCgURf6dDrF5vuzzr7VLVqkZHYSBp0vE6bu0R\n"
-"Sgc5QNxI2talgc4bsp0O0C+Zd4n3Yto0pXl/I6NHVAxlFBECQQD2mahkY+QEHWPV\n"
-"yRY3w3HhRmWBcrkY2zVyvPpqfn/sdHRPYW/yj4Xr/d1CO9VyFmEs4k324lIvu6LT\n"
-"WDdpPlcJAkEA9LOZv5aNeAm8ckvvXH7iv8KiONiSz0n9wlisxMhNYTEkOCo1g7jG\n"
-"AX5ZknRC9s4sWCPOBpMhloUvemdQ5FCEIwJBAMqCFwoSCf7jD8hRcUBr7QodoF/0\n"
-"kVJ7OeI2lMJ9jZnlbFp/3snn2Qeam2e38SnWfQi582KKKwnt4eIDMMXpntkCQQDI\n"
-"v1Lh11wl3y7nQZ6T7lCNatp08k+2mQgCWYcbRQweMRd6sD4I2xwt+372ZETPfyLo\n"
-"CC+sOyYx+v+RVpMJS3irAkEA6l98nMteZKmhOgyKSjdolP+ahpZunb+WnCdAtP97\n"
-"rjZyXmEZS3oe7TRCDD28GAGMmxSDvNfOOpyn14ishEs5AQ==\n"
-"-----END RSA PRIVATE KEY-----\n";
-
-/** Third of 3 example authority certificates for unit testing. */
-const char AUTHORITY_CERT_3[] =
-"dir-key-certificate-version 3\n"
-"fingerprint ED3719BF554DE9D7D59F5CA5A4F5AD121D020ED9\n"
-"dir-key-published 2007-06-13 16:52:40\n"
-"dir-key-expires 2008-06-13 16:52:40\n"
-"dir-identity-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBigKCAYEAtB+yw4BNxtZAG4cPaedkhWNmeij7IuNWmXjh58ZYEGurvGyHs1w4\n"
-"QlwNYI2UftSIeIGdWZ5fJ17h9P3xvO6eeJuOt4KPrNOxUbSGrELEx1Lje1fDAJ1X\n"
-"SvN+dvptusxtyFUr8afgTPrFIvYuazQ6q/Rw+NDagjmDx3h/A/enihpBnjwzeH8j\n"
-"Xzu7b+HKnzFnNfveTDdvSy0NSC6tCOnrfXo31XbXRXtlesnMIpbJClUcAv55eyai\n"
-"/PrVPCCUz8mk0sQnn2Xhv1YJmwOlQTGMfg0a0kWLmh+UWcHsGQ4VWxBZJcuzgFHG\n"
-"hu2/Fz6DXSpX5Q6B9HKoGmnH1oBh24l0kUW1jL8BxPY4YDU1Lt5t3qgcDn9dXYcI\n"
-"o8VvyI0ecSc26Q2PYFWX1hpN4VIBZ8uGaW3IpyTdNiRq0g3iMGRFEXcDlWuyMB9E\n"
-"EbSM7m/79V/z7SjDd75EP8Z0qDPESEVB8a8LbuSJtzFVE0KHd7RzkIEN5sorXspZ\n"
-"/THukftSmkIvAgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
-"dir-signing-key\n"
-"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIGJAoGBANrSZlUq38Boz3iuUOydYTJV57rTbq1bz805FP2QG2Z+2bwpgKIOZag/\n"
-"gN2A1ySJaIYLgZIg9irxrLkqlY/UAjC23y6V9fJXP1S3TXoqLmHleW8PsaDLuwTo\n"
-"hCWaR61Mx9WG7IXcodn2Z7RiCfZpSW4Rztbk5WtjQa5jPXSFOuBJAgMBAAE=\n"
-"-----END RSA PUBLIC KEY-----\n"
-"dir-key-certification\n"
-"-----BEGIN SIGNATURE-----\n"
-"UNXZy+4OQ8iat+gw+vg2ynvKj2BYbqZt+EAZAV3rmw6gux44U9TLRECRd6LsA08N\n"
-"4+Vz01TU81xqMgfrUy94ei2YvcfpO8art9/muWHTP9SmOX8S1uqDqLWA+n723C9A\n"
-"HyVXn4aINncO2081gJcIW5+Ul8WTCeZe/n3LVPTCKbTdqxvmrPUdCWlJTQUmb19M\n"
-"T+kcCjaEfgQGLC+Y2MHqYe/nxz+aBKqpjiWUDdjc35va6r/2e3c0jGi1B1xRZxN1\n"
-"xThPZ+CifjDoWBxJdDGlIfZRK1lMnOCJY9w9ibTXQ1UnvE4whFvmB55/t9/XLq4q\n"
-"3pnZz0H7funey3+ilmTxDohoAYT1GX+4a+3xYH07UmAFqlTzqKClj84XEHn+Cer7\n"
-"Nun9kJlJFuBgUpQjwCkzedFZKKLOHgB2h7trJfnqcBpAM8Rup1Bb5u/RcBx9gy1q\n"
-"pMc65FviIrc/Q5TUku6NNbCbnGll1599PvWuUzkG42lJ17V6psKHIsqGtVdHlCUc\n"
-"-----END SIGNATURE-----\n";
-
-/** The private signing key for AUTHORITY_CERT_3 */
-const char AUTHORITY_SIGNKEY_3[] =
-"-----BEGIN RSA PRIVATE KEY-----\n"
-"MIICXgIBAAKBgQDa0mZVKt/AaM94rlDsnWEyVee6026tW8/NORT9kBtmftm8KYCi\n"
-"DmWoP4DdgNckiWiGC4GSIPYq8ay5KpWP1AIwtt8ulfXyVz9Ut016Ki5h5XlvD7Gg\n"
-"y7sE6IQlmketTMfVhuyF3KHZ9me0Ygn2aUluEc7W5OVrY0GuYz10hTrgSQIDAQAB\n"
-"AoGBAIyoeG1AnQmildKeQpiGZackf0uhg2BeRwpFKg//5Q0Sd0Wza+M/2+q1v1Ei\n"
-"86ihxxV7KfPTykk6hmuUSwVkI28Z+5J9NYTr35EzPiUlqpo0iclTkFqrlbqSPULx\n"
-"9fQhvcOGv1c0m5CnYrHsM8eu3tagLg+6OE4abLOYX4Az5pkxAkEA/NwHhVaVJrXH\n"
-"lGDrRAfGtaD5Tzeeg1H9DNZi5lmFiSNR0O11sgDLkiZNP5oM8knyqo8Gq08hwxEb\n"
-"yqMXM3XtJQJBAN2KJbFhOjDIkvJyYvbmcP6P7vV2c9j+oUTKkFMF7vvfWunxMi9j\n"
-"ghbdUKgl7tU0VFpw7ufDDD0pkN6sua3gp1UCQQCvNzTK861U7p/GtMYyFQVf9JTt\n"
-"jMf9jYHBNInBvwTme6AFG5bz6tMlif77dJ9GAXHzODrR2Hq3thJA/3RjR3M1AkBg\n"
-"+6M4ncmtpYC+5lhwob0Bk90WU/6vFflfdhXsYoKWfNb95vsDR9qhS82Nbt25NClh\n"
-"VmMfzoFDHTkwYgj/F4PpAkEA+RaaSRP7BmbvFNqvlm8J/m0RVdAH4+p/Q5Z5u6Yo\n"
-"N7xC/gFi0qFPGKsDvD2CncAYmt+KNsd8S0JGDN4eieKn+Q==\n"
-"-----END RSA PRIVATE KEY-----\n";
-



More information about the tor-commits mailing list