DO NOT MERGE keyupdate patch

Author: haproxyFred

include/haproxy/quic_conn-t.h

@@ -145,9 +145,6 @@ enum quic_pkt_type {
 #define QUIC_PACKET_PNL_BITMASK      0x03
 #define QUIC_PACKET_PN_MAXLEN        4
 
-/* TLS algo supported by QUIC uses a 16-bytes sample for HP. */
-#define QUIC_HP_SAMPLE_LEN           16
-
 /*
  *  0                   1                   2                   3
  *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1

src/quic_tx.c

@@ -1994,8 +1994,8 @@ static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,
 	 * after PN offset. Thus, pn and payload must be at least 4 bytes long,
 	 * so that the sample will be extracted as the AEAD tag.
 	 */
-	if (*pn_len + len < QUIC_PACKET_PN_MAXLEN + QUIC_HP_SAMPLE_LEN) {
-		padding_len = QUIC_PACKET_PN_MAXLEN + QUIC_HP_SAMPLE_LEN - (*pn_len + len);
+	if (*pn_len + len < QUIC_PACKET_PN_MAXLEN) {
+		padding_len = QUIC_PACKET_PN_MAXLEN - *pn_len - (len_frms ? len : 0);
 		len += padding_len;
 	}