From ea213d50b6757782c8ffe9f43d14cbc30e7d11fa Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 26 Jul 2018 19:37:09 +0900
Subject: [PATCH] Do CID assignment after successful decryption
---
lib/ngtcp2_conn.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/lib/ngtcp2_conn.c b/lib/ngtcp2_conn.c
index 43ebf82e..eb3f8d87 100644
--- a/lib/ngtcp2_conn.c
+++ b/lib/ngtcp2_conn.c
@@ -3003,7 +3003,21 @@ static ssize_t conn_recv_handshake_pkt(ngtcp2_conn *conn, const uint8_t *pkt,
ngtcp2_log_rx_pkt_hd(&conn->log, &hd);
- /* Do this after decryption succeeded */
+ rv = conn_ensure_decrypt_buffer(conn, payloadlen);
+ if (rv != 0) {
+ return rv;
+ }
+
+ nwrite = conn_decrypt_pkt(conn, conn->decrypt_buf.base, payloadlen, payload,
+ payloadlen, plain_hdpkt, hdpktlen, hd.pkt_num, ckm,
+ decrypt);
+ if (nwrite < 0) {
+ return (int)nwrite;
+ }
+
+ payload = conn->decrypt_buf.base;
+ payloadlen = (size_t)nwrite;
+
if (conn->server) {
switch (hd.type) {
case NGTCP2_PKT_INITIAL:
@@ -3037,21 +3051,6 @@ static ssize_t conn_recv_handshake_pkt(ngtcp2_conn *conn, const uint8_t *pkt,
}
}
- rv = conn_ensure_decrypt_buffer(conn, payloadlen);
- if (rv != 0) {
- return rv;
- }
-
- nwrite = conn_decrypt_pkt(conn, conn->decrypt_buf.base, payloadlen, payload,
- payloadlen, plain_hdpkt, hdpktlen, hd.pkt_num, ckm,
- decrypt);
- if (nwrite < 0) {
- return (int)nwrite;
- }
-
- payload = conn->decrypt_buf.base;
- payloadlen = (size_t)nwrite;
-
for (; payloadlen;) {
nread = ngtcp2_pkt_decode_frame(fr, payload, payloadlen);
if (nread < 0) {
--
GitLab