Merge branch '12498_ed25519_keys_v6'

Fixed numerous conflicts, and ported code to use new base64 api.

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/common/container.h
Simple merge

diff --cc src/common/crypto.c
index fcd862f045e54ada6ae0c2f2c60410d7c4749c41,2ccff80c7b6b9b2665b49b7471eea9a6abee6699..d77d5e20dc8b88aa3ae391eb9a1e3c680999926d
--- 1/src/common/crypto.c
--- 2/src/common/crypto.c
+++ b/src/common/crypto.c
@@@ -2588,93 -2711,76 +2607,152 @@@ base64_encode(char *dest, size_t destle
      return -1;
    if (destlen > SIZE_T_CEILING)
      return -1;
 -  if (destlen)
 -    *dest = 0; /* Ensure we always initialize the buffer */
 -
 -  EVP_EncodeInit(&ctx);
 -  EVP_EncodeUpdate(&ctx, (unsigned char*)dest, &len,
 -                   (unsigned char*)src, (int)srclen);
 -  EVP_EncodeFinal(&ctx, (unsigned char*)(dest+len), &ret);
 -  ret += len;
 -  return ret;
 +  if (enclen > INT_MAX)
 +    return -1;
 +
 +  memset(dest, 0, enclen);
 +
 +  /* XXX/Yawning: If this ends up being too slow, this can be sped up
 +   * by separating the multiline format case and the normal case, and
 +   * processing 48 bytes of input at a time when newlines are desired.
 +   */
 +#define ENCODE_CHAR(ch) \
 +  STMT_BEGIN                                                    \
 +    *d++ = ch;                                                  \
 +    if (flags & BASE64_ENCODE_MULTILINE) {                      \
 +      if (++linelen % BASE64_OPENSSL_LINELEN == 0) {            \
 +        linelen = 0;                                            \
 +        *d++ = '\n';                                            \
 +      }                                                         \
 +    }                                                           \
 +  STMT_END
 +
 +#define ENCODE_N(idx) \
 +  ENCODE_CHAR(base64_encode_table[(n >> ((3 - idx) * 6)) & 0x3f])
 +
 +#define ENCODE_PAD() ENCODE_CHAR('=')
 +
 +  /* Iterate over all the bytes in src.  Each one will add 8 bits to the
 +   * value we're encoding.  Accumulate bits in <b>n</b>, and whenever we
 +   * have 24 bits, batch them into 4 bytes and flush those bytes to dest.
 +   */
 +  for ( ; usrc < eous; ++usrc) {
 +    n = (n << 8) | *usrc;
 +    if ((++n_idx) == 3) {
 +      ENCODE_N(0);
 +      ENCODE_N(1);
 +      ENCODE_N(2);
 +      ENCODE_N(3);
 +      n_idx = 0;
 +      n = 0;
 +    }
 +  }
 +  switch (n_idx) {
 +  case 0:
 +    /* 0 leftover bits, no pading to add. */
 +    break;
 +  case 1:
 +    /* 8 leftover bits, pad to 12 bits, write the 2 6-bit values followed
 +     * by 2 padding characters.
 +     */
 +    n <<= 4;
 +    ENCODE_N(2);
 +    ENCODE_N(3);
 +    ENCODE_PAD();
 +    ENCODE_PAD();
 +    break;
 +  case 2:
 +    /* 16 leftover bits, pad to 18 bits, write the 3 6-bit values followed
 +     * by 1 padding character.
 +     */
 +    n <<= 2;
 +    ENCODE_N(1);
 +    ENCODE_N(2);
 +    ENCODE_N(3);
 +    ENCODE_PAD();
 +    break;
 +  default:
 +    /* Something went catastrophically wrong. */
 +    tor_fragile_assert();
 +    return -1;
 +  }
 +
 +#undef ENCODE_N
 +#undef ENCODE_PAD
 +#undef ENCODE_CHAR
 +
 +  /* Multiline output always includes at least one newline. */
 +  if (flags & BASE64_ENCODE_MULTILINE && linelen != 0)
 +    *d++ = '\n';
 +
 +  tor_assert(d - dest == (ptrdiff_t)enclen);
 +
 +  *d++ = '\0'; /* NUL terminate the output. */
 +
 +  return (int) enclen;
  }
  
 -  int n = base64_encode(dest, destlen, (const char*) src, srclen);
+ /** As base64_encode, but do not add any internal spaces or external padding
+  * to the output stream. */
+ int
+ base64_encode_nopad(char *dest, size_t destlen,
+                     const uint8_t *src, size_t srclen)
+ {
++  int n = base64_encode(dest, destlen, (const char*) src, srclen, 0);
+   if (n <= 0)
+     return n;
+   tor_assert((size_t)n < destlen && dest[n] == 0);
+   char *in, *out;
+   in = out = dest;
+   while (*in) {
+     if (*in == '=' || *in == '\n') {
+       ++in;
+     } else {
+       *out++ = *in++;
+     }
+   }
+   *out = 0;
+ 
+   tor_assert(out - dest <= INT_MAX);
+ 
+   return (int)(out - dest);
+ }
+ 
+ /** As base64_decode, but do not require any padding on the input */
+ int
+ base64_decode_nopad(uint8_t *dest, size_t destlen,
+                     const char *src, size_t srclen)
+ {
+   if (srclen > SIZE_T_CEILING - 4)
+     return -1;
+   char *buf = tor_malloc(srclen + 4);
+   memcpy(buf, src, srclen+1);
+   size_t buflen;
+   switch (srclen % 4)
+     {
+     case 0:
+     default:
+       buflen = srclen;
+       break;
+     case 1:
+       tor_free(buf);
+       return -1;
+     case 2:
+       memcpy(buf+srclen, "==", 3);
+       buflen = srclen + 2;
+       break;
+     case 3:
+       memcpy(buf+srclen, "=", 2);
+       buflen = srclen + 1;
+       break;
+   }
+   int n = base64_decode((char*)dest, destlen, buf, buflen);
+   tor_free(buf);
+   return n;
+ }
+ 
 +#undef BASE64_OPENSSL_LINELEN
 +
  /** @{ */
  /** Special values used for the base64_decode_table */
  #define X 255
@@@ -2795,8 -2922,9 +2873,9 @@@ base64_decode(char *dest, size_t destle
  #undef PAD
  
  /** Base64 encode DIGEST_LINE bytes from <b>digest</b>, remove the trailing =
 - * and newline characters, and store the nul-terminated result in the first
 + * characters, and store the nul-terminated result in the first
   * BASE64_DIGEST_LEN+1 bytes of <b>d64</b>.  */
+ /* XXXX unify with crypto_format.c code */
  int
  digest_to_base64(char *d64, const char *digest)
  {
@@@ -2820,8 -2961,10 +2900,9 @@@ digest_from_base64(char *digest, const 
  }
  
  /** Base64 encode DIGEST256_LINE bytes from <b>digest</b>, remove the
 - * trailing = and newline characters, and store the nul-terminated result in
 - * the first BASE64_DIGEST256_LEN+1 bytes of <b>d64</b>.  */
 -/* XXXX unify with crypto_format.c code */
 + * trailing = characters, and store the nul-terminated result in the first
-  * BASE64_DIGEST256_LEN+1 bytes of <b>d64</b>.  */
++ * BASE64_DIGEST256_LEN+1 bytes of <b>d64</b>. */
++ /* XXXX unify with crypto_format.c code */
  int
  digest256_to_base64(char *d64, const char *digest)
  {

diff --cc src/common/crypto.h
index 05572f4565cdd46d28026d9b58355ef0c97ced44,15d1f6e3a9a69f4c24b54405acdd492f0a8c11a4..b953ab93e73de0281bd8d17dc7a4c7ea5018e6df
--- 1/src/common/crypto.h
--- 2/src/common/crypto.h
+++ b/src/common/crypto.h
@@@ -273,11 -273,13 +278,16 @@@ struct smartlist_t
  void *smartlist_choose(const struct smartlist_t *sl);
  void smartlist_shuffle(struct smartlist_t *sl);
  
 -int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen);
 +#define BASE64_ENCODE_MULTILINE 1
 +size_t base64_encode_size(size_t srclen, int flags);
 +int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen,
 +                  int flags);
  int base64_decode(char *dest, size_t destlen, const char *src, size_t srclen);
+ int base64_encode_nopad(char *dest, size_t destlen,
+                         const uint8_t *src, size_t srclen);
+ int base64_decode_nopad(uint8_t *dest, size_t destlen,
+                         const char *src, size_t srclen);
+ 
  /** Characters that can appear (case-insensitively) in a base32 encoding. */
  #define BASE32_CHARS "abcdefghijklmnopqrstuvwxyz234567"
  void base32_encode(char *dest, size_t destlen, const char *src, size_t srclen);

diff --cc src/common/crypto_format.c
Simple merge

diff --cc src/common/tortls.c
index 2b8daaaf0635934cdb0984177f7f2ac8c8bbdf29,e498b2ac237994eb3267720a003e19fb168f4420..098df9db6cc16d27effef0f7277b7466d97b66c2
--- 1/src/common/tortls.c
--- 2/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -116,8 -114,15 +116,8 @@@
  #define SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x0010
  #endif
  
 -/** Does the run-time openssl version look like we need
 - * SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION? */
 -static int use_unsafe_renegotiation_op = 0;
 -/** Does the run-time openssl version look like we need
 - * SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION? */
 -static int use_unsafe_renegotiation_flag = 0;
 -
  /** Structure that we use for a single certificate. */
- struct tor_cert_t {
+ struct tor_x509_cert_t {
    X509 *cert;
    uint8_t *encoded;
    size_t encoded_len;

diff --cc src/common/tortls.h
Simple merge

diff --cc src/or/channeltls.c
index 1cf697ccc5f265ea25c03cd0acc1a9ed109df410,0376e74bcff25f885fed2b29ecd1ab8ae39938d0..ecf02182fc303d85873a2ecdf54635095c47aa26
--- 1/src/or/channeltls.c
--- 2/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@@ -22,8 -24,8 +24,9 @@@
  #include "connection.h"
  #include "connection_or.h"
  #include "control.h"
+ #include "link_handshake.h"
  #include "relay.h"
 +#include "rephist.h"
  #include "router.h"
  #include "routerlist.h"
  #include "scheduler.h"

diff --cc src/or/config.c
Simple merge

diff --cc src/or/config.h
Simple merge

diff --cc src/or/connection_or.c
Simple merge

diff --cc src/or/dirserv.c
Simple merge

diff --cc src/or/dirvote.c
Simple merge

diff --cc src/or/include.am
index 0ce3cdc5c3d106dbf31172f6a83c841a7a3c9422,9245ade64f095f2f8c5a061627466019afab31de..6bbf78871c6177b3a47317c63605f08f82134129
--- 1/src/or/include.am
--- 2/src/or/include.am
+++ b/src/or/include.am
@@@ -77,18 -80,19 +80,14 @@@ LIBTOR_A_SOURCES = 
        src/or/scheduler.c                              \
        src/or/statefile.c                              \
        src/or/status.c                                 \
+       src/or/torcert.c                                \
        src/or/onion_ntor.c                             \
        $(evdns_source)                                 \
 -      $(tor_platform_source)                          \
 -      src/or/config_codedigest.c
 +      $(tor_platform_source)
  
  src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
  src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
  
- #libtor_a_LIBADD = $(top_builddir)/common/libor.a \
- #    $(top_builddir)/common/libor-crypto.a \
- #    $(top_builddir)/common/libor-event.a
- 
 -#libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \
 -#     ../common/libor-event.a
 -#src_or_libtor_a_LIBADD = src/trunnel/libor-trunnel.a
--
  src_or_tor_SOURCES = src/or/tor_main.c
  AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or
  
@@@ -120,12 -124,12 +119,12 @@@ src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(
  src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
  src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
        src/common/libor-crypto-testing.a $(LIBDONNA) \
-       src/common/libor-event-testing.a \
+       src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
        @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
        @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@
 -TESTING_TOR_BINARY = ./src/or/tor-cov
 +TESTING_TOR_BINARY = $(top_builddir)/src/or/tor-cov
  else
 -TESTING_TOR_BINARY = ./src/or/tor
 +TESTING_TOR_BINARY = $(top_builddir)/src/or/tor
  endif
  
  ORHEADERS = \

diff --cc src/or/main.c
index 74e6b33397113d2c1c897ee868dc925ea4a1474a,4fac17a59c6bb057e132f41b772fd5ab9ed134d1..bbee8e0fb9e61927447d644fad37463f46d1ec10
--- 1/src/or/main.c
--- 2/src/or/main.c
+++ b/src/or/main.c
@@@ -1200,46 -1205,7 +1202,49 @@@ get_signewnym_epoch(void
    return newnym_epoch;
  }
  
 -static time_t time_to_check_descriptor = 0;
 +typedef struct {
 +  time_t last_rotated_x509_certificate;
 +  time_t check_v3_certificate;
 +  time_t check_listeners;
 +  time_t download_networkstatus;
 +  time_t try_getting_descriptors;
 +  time_t reset_descriptor_failures;
 +  time_t add_entropy;
 +  time_t write_bridge_status_file;
 +  time_t downrate_stability;
 +  time_t save_stability;
 +  time_t clean_caches;
 +  time_t recheck_bandwidth;
 +  time_t check_for_expired_networkstatus;
 +  time_t write_stats_files;
 +  time_t write_bridge_stats;
 +  time_t check_port_forwarding;
 +  time_t launch_reachability_tests;
 +  time_t retry_dns_init;
 +  time_t next_heartbeat;
 +  time_t check_descriptor;
 +  /** When do we next launch DNS wildcarding checks? */
 +  time_t check_for_correct_dns;
++  /** When do we next make sure our Ed25519 keys aren't about to expire? */
++  time_t check_ed_keys;
++
 +} time_to_t;
 +
 +static time_to_t time_to = {
-   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
++  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 +};
 +
 +/** Reset all the time_to's so we'll do all our actions again as if we
 + * just started up.
 + * Useful if our clock just moved back a long time from the future,
 + * so we don't wait until that future arrives again before acting.
 + */
 +void
 +reset_all_main_loop_timers(void)
 +{
 +  memset(&time_to, 0, sizeof(time_to));
 +}
 +
  /**
   * Update our schedule so that we'll check whether we need to update our
   * descriptor immediately, rather than after up to CHECK_DESCRIPTOR_INTERVAL
@@@ -1297,8 -1282,20 +1302,20 @@@ run_scheduled_events(time_t now
        router_upload_dir_desc_to_dirservers(0);
    }
  
 -  if (is_server && time_to_check_ed_keys < now) {
++  if (is_server && time_to.check_ed_keys < now) {
+     if (should_make_new_ed_keys(options, now)) {
+       if (load_ed_keys(options, now) < 0 ||
+           generate_ed_link_cert(options, now)) {
+         log_err(LD_OR, "Unable to update Ed25519 keys!  Exiting.");
+         tor_cleanup();
+         exit(0);
+       }
+     }
 -    time_to_check_ed_keys = now + 30;
++    time_to.check_ed_keys = now + 30;
+   }
+ 
    if (!should_delay_dir_fetches(options, NULL) &&
 -      time_to_try_getting_descriptors < now) {
 +      time_to.try_getting_descriptors < now) {
      update_all_descriptor_downloads(now);
      update_extrainfo_downloads(now);
      if (router_have_minimum_dir_info())

diff --cc src/or/or.h
Simple merge

diff --cc src/or/router.c
index 24b7c750f6fb96ba95470e5eac89d17b890f9b9d,00cd0578c6574e0030038e525010d3c913a22f4e..6532f97d24cd5f5c7e6d9533d3345ec8adec1a88
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c
@@@ -2358,6 -2372,21 +2403,22 @@@ router_dump_router_to_string(routerinfo
      goto err;
    }
  
 -                      router->signing_key_cert->encoded_len) < 0) {
+   if (emit_ed_sigs) {
+     /* Encode ed25519 signing cert */
+     char ed_cert_base64[256];
+     if (base64_encode(ed_cert_base64, sizeof(ed_cert_base64),
+                       (const char*)router->signing_key_cert->encoded,
++                      router->signing_key_cert->encoded_len,
++                      BASE64_ENCODE_MULTILINE) < 0) {
+       log_err(LD_BUG,"Couldn't base64-encode signing key certificate!");
+       goto err;
+     }
+     tor_asprintf(&ed_cert_line, "identity-ed25519\n"
+                  "-----BEGIN ED25519 CERT-----\n"
+                  "%s"
+                  "-----END ED25519 CERT-----\n", ed_cert_base64);
+   }
+ 
    /* PEM-encode the onion key */
    if (crypto_pk_write_public_key_to_string(router->onion_pkey,
                                             &onion_pkey,&onion_pkeylen)<0) {
@@@ -2372,6 -2401,67 +2433,69 @@@
      goto err;
    }
  
 -    if (base64_encode(buf, sizeof(buf), (const char*)tap_cc, tap_cc_len) < 0) {
+   /* Cross-certify with RSA key */
+   if (tap_key && router->signing_key_cert &&
+       router->signing_key_cert->signing_key_included) {
+     char buf[256];
+     int tap_cc_len = 0;
+     uint8_t *tap_cc =
+       make_tap_onion_key_crosscert(tap_key,
+                                    &router->signing_key_cert->signing_key,
+                                    router->identity_pkey,
+                                    &tap_cc_len);
+     if (!tap_cc) {
+       log_warn(LD_BUG,"make_tap_onion_key_crosscert failed!");
+       goto err;
+     }
+ 
 -                      (const char*)cert->encoded, cert->encoded_len)<0) {
++    if (base64_encode(buf, sizeof(buf), (const char*)tap_cc, tap_cc_len,
++                      BASE64_ENCODE_MULTILINE) < 0) {
+       log_warn(LD_BUG,"base64_encode(rsa_crosscert) failed!");
+       tor_free(tap_cc);
+       goto err;
+     }
+     tor_free(tap_cc);
+ 
+     tor_asprintf(&rsa_tap_cc_line,
+                  "onion-key-crosscert\n"
+                  "-----BEGIN CROSSCERT-----\n"
+                  "%s"
+                  "-----END CROSSCERT-----\n", buf);
+   }
+ 
+   /* Cross-certify with onion keys */
+   if (ntor_keypair && router->signing_key_cert &&
+       router->signing_key_cert->signing_key_included) {
+     int sign = 0;
+     char buf[256];
+     /* XXXX Base the expiration date on the actual onion key expiration time?*/
+     tor_cert_t *cert =
+       make_ntor_onion_key_crosscert(ntor_keypair,
+                                 &router->signing_key_cert->signing_key,
+                                 router->cache_info.published_on,
+                                 MIN_ONION_KEY_LIFETIME, &sign);
+     if (!cert) {
+       log_warn(LD_BUG,"make_ntor_onion_key_crosscert failed!");
+       goto err;
+     }
+     tor_assert(sign == 0 || sign == 1);
+ 
+     if (base64_encode(buf, sizeof(buf),
++                      (const char*)cert->encoded, cert->encoded_len,
++                      BASE64_ENCODE_MULTILINE)<0) {
+       log_warn(LD_BUG,"base64_encode(ntor_crosscert) failed!");
+       tor_cert_free(cert);
+       goto err;
+     }
+     tor_cert_free(cert);
+ 
+     tor_asprintf(&ntor_cc_line,
+                  "ntor-onion-key-crosscert %d\n"
+                  "-----BEGIN ED25519 CERT-----\n"
+                  "%s"
+                  "-----END ED25519 CERT-----\n", sign, buf);
+   }
+ 
    /* Encode the publication time. */
    format_iso_time(published, router->cache_info.published_on);
  
@@@ -2695,9 -2819,33 +2853,34 @@@ extrainfo_dump_to_string(char **s_out, 
                  extrainfo->cache_info.identity_digest, DIGEST_LEN);
    format_iso_time(published, extrainfo->cache_info.published_on);
    bandwidth_usage = rep_hist_get_bandwidth_lines();
 -                      extrainfo->signing_key_cert->encoded_len) < 0) {
+   if (emit_ed_sigs) {
+     if (!extrainfo->signing_key_cert->signing_key_included ||
+         !ed25519_pubkey_eq(&extrainfo->signing_key_cert->signed_key,
+                            &signing_keypair->pubkey)) {
+       log_warn(LD_BUG, "Tried to sign a extrainfo descriptor with a "
+                "mismatched ed25519 key chain %d",
+                extrainfo->signing_key_cert->signing_key_included);
+       goto err;
+     }
+     char ed_cert_base64[256];
+     if (base64_encode(ed_cert_base64, sizeof(ed_cert_base64),
+                       (const char*)extrainfo->signing_key_cert->encoded,
++                      extrainfo->signing_key_cert->encoded_len,
++                      BASE64_ENCODE_MULTILINE) < 0) {
+       log_err(LD_BUG,"Couldn't base64-encode signing key certificate!");
+       goto err;
+     }
+     tor_asprintf(&ed_cert_line, "identity-ed25519\n"
+                  "-----BEGIN ED25519 CERT-----\n"
+                  "%s"
+                  "-----END ED25519 CERT-----\n", ed_cert_base64);
+   } else {
+     ed_cert_line = tor_strdup("");
+   }
  
-   tor_asprintf(&pre, "extra-info %s %s\npublished %s\n%s",
+   tor_asprintf(&pre, "extra-info %s %s\n%spublished %s\n%s",
                 extrainfo->nickname, identity,
+                ed_cert_line,
                 published, bandwidth_usage);
    tor_free(bandwidth_usage);
    smartlist_add(chunks, pre);

diff --cc src/or/router.h
index 73b43bc751e002fa53fb76c24d7ea5ae82448963,695cfd38e513316abc4c6f24c783bb2eef364174..61b35d6b5a1ddec8c8535e90dd2e2b12276d1a21
--- 1/src/or/router.h
--- 2/src/or/router.h
+++ b/src/or/router.h
@@@ -89,10 -89,12 +89,13 @@@ const uint8_t *router_get_my_id_digest(
  int router_extrainfo_digest_is_me(const char *digest);
  int router_is_me(const routerinfo_t *router);
  int router_pick_published_address(const or_options_t *options, uint32_t *addr);
 +int router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e);
  int router_rebuild_descriptor(int force);
  char *router_dump_router_to_string(routerinfo_t *router,
-                                    crypto_pk_t *ident_key);
+                                    const crypto_pk_t *ident_key,
+                                    const crypto_pk_t *tap_key,
+                                    const curve25519_keypair_t *ntor_keypair,
+                                    const ed25519_keypair_t *signing_keypair);
  char *router_dump_exit_policy_to_string(const routerinfo_t *router,
                                           int include_ipv4,
                                           int include_ipv6);

diff --cc src/or/routerlist.c
index fd096799de9a10b9f43d979c4030224fa7618e64,a5310519d5377636c413ed29adc4f29f0b8e472b..7eba13a544b7547b3a9879c792e6fd4be64bee4f
--- 1/src/or/routerlist.c
--- 2/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -37,7 -38,8 +38,9 @@@
  #include "routerlist.h"
  #include "routerparse.h"
  #include "routerset.h"
 -#include "../common/sandbox.h"
 +#include "sandbox.h"
+ #include "torcert.h"
++
  // #define DEBUG_ROUTERLIST
  
  /****************************************************************************/

diff --cc src/or/routerparse.c
Simple merge

diff --cc src/or/routerparse.h
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge

diff --cc src/test/test_crypto.c
index 7944864bd79f3e683a1c3db085a1924b5dd5ebf1,15ba14b3bf0aca23bacf36be86c5c32bb8fa9e13..6cba850f30ecc8f7c55f279ae54211e9f463d44b
--- 1/src/test/test_crypto.c
--- 2/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@@ -696,8 -618,9 +696,9 @@@ test_crypto_formats(void *arg
    /* Base64 tests */
    memset(data1, 6, 1024);
    for (idx = 0; idx < 10; ++idx) {
 -    i = base64_encode(data2, 1024, data1, idx);
 +    i = base64_encode(data2, 1024, data1, idx, 0);
      tt_int_op(i, OP_GE, 0);
+     tt_int_op(i, OP_EQ, strlen(data2));
      j = base64_decode(data3, 1024, data2, i);
      tt_int_op(j,OP_EQ, idx);
      tt_mem_op(data3,OP_EQ, data1, idx);

diff --cc src/test/test_dir.c
index a949f5de73d8a68cc7cb3ab5fe256c46b3e7f6db,5f68c34b39bd2d9f7b485c471a69866731da7ce5..3e9e955b2b3da7626f3392769fac86feaf328abb
--- 1/src/test/test_dir.c
--- 2/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@@ -127,6 -133,22 +133,23 @@@ test_dir_formats(void *arg
    ex2->prt_min = ex2->prt_max = 24;
    r2 = tor_malloc_zero(sizeof(routerinfo_t));
    r2->addr = 0x0a030201u; /* 10.3.2.1 */
 -                r2->signing_key_cert->encoded_len);
+   ed25519_keypair_t kp1, kp2;
+   ed25519_secret_key_from_seed(&kp1.seckey,
+                           (const uint8_t*)"YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY");
+   ed25519_public_key_generate(&kp1.pubkey, &kp1.seckey);
+   ed25519_secret_key_from_seed(&kp2.seckey,
+                           (const uint8_t*)"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+   ed25519_public_key_generate(&kp2.pubkey, &kp2.seckey);
+   r2->signing_key_cert = tor_cert_create(&kp1,
+                                          CERT_TYPE_ID_SIGNING,
+                                          &kp2.pubkey,
+                                          now, 86400,
+                                          CERT_FLAG_INCLUDE_SIGNING_KEY);
+   char cert_buf[256];
+   base64_encode(cert_buf, sizeof(cert_buf),
+                 (const char*)r2->signing_key_cert->encoded,
++                r2->signing_key_cert->encoded_len,
++                BASE64_ENCODE_MULTILINE);
    r2->platform = tor_strdup(platform);
    r2->cache_info.published_on = 5;
    r2->or_port = 9005;
@@@ -215,19 -243,49 +244,52 @@@
    strlcat(buf2, pk2_str, sizeof(buf2));
    strlcat(buf2, "signing-key\n", sizeof(buf2));
    strlcat(buf2, pk1_str, sizeof(buf2));
 -  base64_encode(cert_buf, sizeof(cert_buf), (char*)rsa_cc, rsa_cc_len);
+   int rsa_cc_len;
+   rsa_cc = make_tap_onion_key_crosscert(pk2,
+                                         &kp1.pubkey,
+                                         pk1,
+                                         &rsa_cc_len);
+   tt_assert(rsa_cc);
 -                (char*)ntor_cc->encoded, ntor_cc->encoded_len);
++  base64_encode(cert_buf, sizeof(cert_buf), (char*)rsa_cc, rsa_cc_len,
++                BASE64_ENCODE_MULTILINE);
+   strlcat(buf2, "onion-key-crosscert\n"
+           "-----BEGIN CROSSCERT-----\n", sizeof(buf2));
+   strlcat(buf2, cert_buf, sizeof(buf2));
+   strlcat(buf2, "-----END CROSSCERT-----\n", sizeof(buf2));
+   int ntor_cc_sign;
+   ntor_cc = make_ntor_onion_key_crosscert(&r2_onion_keypair,
+                                           &kp1.pubkey,
+                                           r2->cache_info.published_on,
+                                           MIN_ONION_KEY_LIFETIME,
+                                           &ntor_cc_sign);
+   tt_assert(ntor_cc);
+   base64_encode(cert_buf, sizeof(cert_buf),
++                (char*)ntor_cc->encoded, ntor_cc->encoded_len,
++                BASE64_ENCODE_MULTILINE);
+   tor_snprintf(buf2+strlen(buf2), sizeof(buf2)-strlen(buf2),
+                "ntor-onion-key-crosscert %d\n"
+                "-----BEGIN ED25519 CERT-----\n"
+                "%s"
+                "-----END ED25519 CERT-----\n", ntor_cc_sign, cert_buf);
+ 
    strlcat(buf2, "hidden-service-dir\n", sizeof(buf2));
-   strlcat(buf2, "ntor-onion-key "
-           "skyinAnvardNostarsNomoonNowindormistsorsnow=\n", sizeof(buf2));
+   strlcat(buf2, "ntor-onion-key ", sizeof(buf2));
+   base64_encode(cert_buf, sizeof(cert_buf),
 -                (const char*)r2_onion_keypair.pubkey.public_key, 32);
++                (const char*)r2_onion_keypair.pubkey.public_key, 32,
++                BASE64_ENCODE_MULTILINE);
+   strlcat(buf2, cert_buf, sizeof(buf2));
    strlcat(buf2, "accept *:80\nreject 18.0.0.0/8:24\n", sizeof(buf2));
-   strlcat(buf2, "router-signature\n", sizeof(buf2));
+   strlcat(buf2, "router-sig-ed25519 ", sizeof(buf2));
  
-   buf = router_dump_router_to_string(r2, pk1);
+   buf = router_dump_router_to_string(r2, pk1, pk2, &r2_onion_keypair, &kp2);
+   tt_assert(buf);
    buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same
                               * twice */
-   tt_str_op(buf,OP_EQ, buf2);
+ 
+   tt_str_op(buf, OP_EQ, buf2);
    tor_free(buf);
  
-   buf = router_dump_router_to_string(r2, pk1);
+   buf = router_dump_router_to_string(r2, pk1, NULL, NULL, NULL);
    cp = buf;
    rp2 = router_parse_entry_from_string((const char*)cp,NULL,1,0,NULL,NULL);
    tt_assert(rp2);

diff --cc src/trunnel/include.am
Simple merge