From 52f64cf39eb18e7bce36df6dcf0f8d62ab8f1832 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 23 Jan 2020 19:06:15 +0900
Subject: [PATCH] Start draft-25 development
---
README.rst | 5 +++--
ci/build_openssl.sh | 2 +-
lib/includes/ngtcp2/ngtcp2.h | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/README.rst b/README.rst
index b51fc6fd..bf0de5c9 100644
--- a/README.rst
+++ b/README.rst
@@ -19,6 +19,7 @@ only.
For older draft implementations:
+- `draft-24 <https://github.com/ngtcp2/ngtcp2/tree/draft-24>`_
- `draft-23 <https://github.com/ngtcp2/ngtcp2/tree/draft-23>`_
- `draft-22 <https://github.com/ngtcp2/ngtcp2/tree/draft-22>`_
@@ -52,14 +53,14 @@ The client and server under examples directory require patched OpenSSL
as crypto backend:
* Patched OpenSSL
- (https://github.com/tatsuhiro-t/openssl/tree/OpenSSL_1_1_1d-quic-draft-24)
+ (https://github.com/tatsuhiro-t/openssl/tree/OpenSSL_1_1_1d-quic-draft-25)
Build from git
--------------
.. code-block:: text
- $ git clone --depth 1 -b OpenSSL_1_1_1d-quic-draft-24 https://github.com/tatsuhiro-t/openssl
+ $ git clone --depth 1 -b OpenSSL_1_1_1d-quic-draft-25 https://github.com/tatsuhiro-t/openssl
$ cd openssl
$ # For Linux
$ ./config enable-tls1_3 --prefix=$PWD/build
diff --git a/ci/build_openssl.sh b/ci/build_openssl.sh
index 002e0435..8fa6b24a 100755
--- a/ci/build_openssl.sh
+++ b/ci/build_openssl.sh
@@ -2,7 +2,7 @@
#build last openssl master (for Travis)
cd ..
-git clone --depth 1 -b OpenSSL_1_1_1d-quic-draft-24 https://github.com/tatsuhiro-t/openssl
+git clone --depth 1 -b OpenSSL_1_1_1d-quic-draft-25 https://github.com/tatsuhiro-t/openssl
cd openssl
./config enable-tls1_3 --prefix=$PWD/build
make -j$(nproc)
diff --git a/lib/includes/ngtcp2/ngtcp2.h b/lib/includes/ngtcp2/ngtcp2.h
index 11ae4aef..4a8fd4ed 100644
--- a/lib/includes/ngtcp2/ngtcp2.h
+++ b/lib/includes/ngtcp2/ngtcp2.h
@@ -159,7 +159,7 @@ typedef struct ngtcp2_mem {
} ngtcp2_mem;
/* NGTCP2_PROTO_VER is the supported QUIC protocol version. */
-#define NGTCP2_PROTO_VER 0xff000018u
+#define NGTCP2_PROTO_VER 0xff000019u
/* NGTCP2_PROTO_VER_MAX is the highest QUIC version the library
supports. */
#define NGTCP2_PROTO_VER_MAX NGTCP2_PROTO_VER
@@ -167,7 +167,7 @@ typedef struct ngtcp2_mem {
/* NGTCP2_ALPN_H3 is a serialized form of HTTP/3 ALPN protocol
identifier this library supports. Notice that the first byte is
the length of the following protocol identifier. */
-#define NGTCP2_ALPN_H3 "\x5h3-24"
+#define NGTCP2_ALPN_H3 "\x5h3-25"
#define NGTCP2_MAX_PKTLEN_IPV4 1252
#define NGTCP2_MAX_PKTLEN_IPV6 1232
--
GitLab