Compile with the latest ngtcp2

src/shrpx_http3_upstream.cc

@@ -471,8 +471,8 @@ int handshake_completed(ngtcp2_conn *conn, void *user_data) {
 } // namespace
 
 int Http3Upstream::handshake_completed() {
-  std::array<uint8_t, SHRPX_QUIC_MAX_TOKENLEN> token;
-  size_t tokenlen = token.size();
+  std::array<uint8_t, NGTCP2_CRYPTO_MAX_REGULAR_TOKENLEN> token;
+  size_t tokenlen;
 
   auto path = ngtcp2_conn_get_path(conn_);
   auto worker = handler_->get_worker();

src/shrpx_quic.h

@@ -62,24 +62,9 @@ constexpr size_t SHRPX_QUIC_CID_PREFIXLEN = 8;
 constexpr size_t SHRPX_QUIC_MAX_UDP_PAYLOAD_SIZE = 1472;
 constexpr size_t SHRPX_QUIC_STATELESS_RESET_SECRETLEN = 32;
 constexpr size_t SHRPX_QUIC_TOKEN_SECRETLEN = 32;
-constexpr size_t SHRPX_QUIC_TOKEN_RAND_DATALEN = 16;
 constexpr size_t SHRPX_QUIC_CONN_CLOSE_PKTLEN = 256;
 constexpr size_t SHRPX_QUIC_STATELESS_RESET_BURST = 100;
 
-// SHRPX_QUIC_RETRY_TOKEN_MAGIC is the magic byte of Retry token.
-// Sent in plaintext.
-constexpr uint8_t SHRPX_QUIC_RETRY_TOKEN_MAGIC = 0xb6;
-constexpr size_t SHRPX_QUIC_MAX_RETRY_TOKENLEN =
-    /* magic */ 1 + sizeof(uint64_t) + NGTCP2_MAX_CIDLEN +
-    /* aead tag */ 16 + SHRPX_QUIC_TOKEN_RAND_DATALEN;
-
-// SHRPX_QUIC_TOKEN_MAGIC is the magic byte of token which is sent in
-// NEW_TOKEN frame.  Sent in plaintext.
-constexpr uint8_t SHRPX_QUIC_TOKEN_MAGIC = 0x36;
-constexpr size_t SHRPX_QUIC_MAX_TOKENLEN =
-    /* magic */ 1 + sizeof(uint64_t) + /* aead tag */ 16 +
-    SHRPX_QUIC_TOKEN_RAND_DATALEN;
-
 ngtcp2_tstamp quic_timestamp();
 
 int quic_send_packet(const UpstreamAddr *faddr, const sockaddr *remote_sa,

src/shrpx_quic_connection_handler.cc

@@ -152,7 +152,7 @@ int QUICConnectionHandler::handle_packet(const UpstreamAddr *faddr,
       auto &secret = quic_secret->token_secret;
 
       switch (hd.token.base[0]) {
-      case SHRPX_QUIC_RETRY_TOKEN_MAGIC:
+      case NGTCP2_CRYPTO_TOKEN_MAGIC_RETRY:
         if (verify_retry_token(&odcid, hd.token.base, hd.token.len, &hd.dcid,
                                &remote_addr.su.sa, remote_addr.len,
                                secret.data()) != 0) {
@@ -178,7 +178,7 @@ int QUICConnectionHandler::handle_packet(const UpstreamAddr *faddr,
         tokenlen = hd.token.len;
 
         break;
-      case SHRPX_QUIC_TOKEN_MAGIC:
+      case NGTCP2_CRYPTO_TOKEN_MAGIC_REGULAR:
         if (verify_token(hd.token.base, hd.token.len, &remote_addr.su.sa,
                          remote_addr.len, secret.data()) != 0) {
           if (LOG_ENABLED(INFO)) {
@@ -356,8 +356,8 @@ int QUICConnectionHandler::send_retry(
     return -1;
   }
 
-  std::array<uint8_t, SHRPX_QUIC_MAX_RETRY_TOKENLEN> token;
-  size_t tokenlen = token.size();
+  std::array<uint8_t, NGTCP2_CRYPTO_MAX_RETRY_TOKENLEN> token;
+  size_t tokenlen;
 
   ngtcp2_cid idcid, iscid;
   ngtcp2_cid_init(&idcid, ini_dcid, ini_dcidlen);