RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: quic: Replace v2 draft definitions by those of the final 2 version

Browse Source 
This should finalize the support for the QUIC version 2.

Must be backported to 2.7.
This commit is contained in:
Frdric Lcaille 2023-01-13 16:37:02 +01:00 committed by Willy Tarreau
parent 33d11c464f
commit 21c4c9b854
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/quic_conn-t.h
View File

@ -47,7 +47,7 @@ typedef unsigned long long ull;
#define QUIC_PROTOCOL_VERSION_DRAFT_29 0xff00001d /* draft-29 */ #define QUIC_PROTOCOL_VERSION_DRAFT_29 0xff00001d /* draft-29 */
#define QUIC_PROTOCOL_VERSION_1 0x00000001 /* V1 */ #define QUIC_PROTOCOL_VERSION_1 0x00000001 /* V1 */
#define QUIC_PROTOCOL_VERSION_2_DRAFT 0x709a50c4 /* V2 draft */ #define QUIC_PROTOCOL_VERSION_2 0x6b3343cf /* V2 */
#define QUIC_INITIAL_IPV4_MTU 1252 /* (bytes) */ #define QUIC_INITIAL_IPV4_MTU 1252 /* (bytes) */
#define QUIC_INITIAL_IPV6_MTU 1232 #define QUIC_INITIAL_IPV6_MTU 1232

2
include/haproxy/quic_conn.h
View File

@ -55,7 +55,7 @@ int ssl_quic_initial_ctx(struct bind_conf *bind_conf);
/* Return the long packet type matching with <qv> version and <type> */ /* Return the long packet type matching with <qv> version and <type> */
static inline int quic_pkt_type(int type, uint32_t version) static inline int quic_pkt_type(int type, uint32_t version)
{ {
if (version != QUIC_PROTOCOL_VERSION_2_DRAFT) if (version != QUIC_PROTOCOL_VERSION_2)
return type; return type;
switch (type) { switch (type) {

10
include/haproxy/quic_tls-t.h
View File

@ -70,10 +70,10 @@ extern struct pool_head *pool_head_quic_tls_key;
"\xbe\x0c\x69\x0b\x9f\x66\x57\x5a\x1d\x76\x6b\x54\xe3\x68\xc8\x4e" "\xbe\x0c\x69\x0b\x9f\x66\x57\x5a\x1d\x76\x6b\x54\xe3\x68\xc8\x4e"
#define QUIC_TLS_RETRY_NONCE_V1 \ #define QUIC_TLS_RETRY_NONCE_V1 \
"\x46\x15\x99\xd3\x5d\x63\x2b\xf2\x23\x98\x25\xbb" "\x46\x15\x99\xd3\x5d\x63\x2b\xf2\x23\x98\x25\xbb"
#define QUIC_TLS_RETRY_KEY_V2_DRAFT \ #define QUIC_TLS_RETRY_KEY_V2 \
"\xba\x85\x8d\xc7\xb4\x3d\xe5\xdb\xf8\x76\x17\xff\x4a\xb2\x53\xdb" "\x8f\xb4\xb0\x1b\x56\xac\x48\xe2\x60\xfb\xcb\xce\xad\x7c\xcc\x92"
#define QUIC_TLS_RETRY_NONCE_V2_DRAFT \ #define QUIC_TLS_RETRY_NONCE_V2 \
"\x14\x1b\x99\xc2\x39\xb0\x3e\x78\x5d\x6a\x2e\x9f" "\xd8\x69\x69\xbc\x2d\x7c\x6d\x99\x90\xef\xb0\x4a"
/* QUIC handshake states for both clients and servers. */ /* QUIC handshake states for both clients and servers. */
enum quic_handshake_state { enum quic_handshake_state {
@ -114,7 +114,7 @@ enum quic_tls_pktns {
extern unsigned char initial_salt[20]; extern unsigned char initial_salt[20];
extern const unsigned char initial_salt_draft_29[20]; extern const unsigned char initial_salt_draft_29[20];
extern const unsigned char initial_salt_v1[20]; extern const unsigned char initial_salt_v1[20];
extern const unsigned char initial_salt_v2_draft[20]; extern const unsigned char initial_salt_v2[20];
/* Key phase used for Key Update */ /* Key phase used for Key Update */
struct quic_tls_kp { struct quic_tls_kp {

12
src/quic_conn.c
View File

@ -93,9 +93,9 @@ const struct quic_version quic_versions[] = {
.retry_tag_nonce = (const unsigned char *)QUIC_TLS_RETRY_NONCE_V1, .retry_tag_nonce = (const unsigned char *)QUIC_TLS_RETRY_NONCE_V1,
}, },
{ {
.num = QUIC_PROTOCOL_VERSION_2_DRAFT, .num = QUIC_PROTOCOL_VERSION_2,
.initial_salt = initial_salt_v2_draft, .initial_salt = initial_salt_v2,
.initial_salt_len = sizeof initial_salt_v2_draft, .initial_salt_len = sizeof initial_salt_v2,
.key_label = (const unsigned char *)QUIC_HKDF_KEY_LABEL_V2, .key_label = (const unsigned char *)QUIC_HKDF_KEY_LABEL_V2,
.key_label_len = sizeof(QUIC_HKDF_KEY_LABEL_V2) - 1, .key_label_len = sizeof(QUIC_HKDF_KEY_LABEL_V2) - 1,
.iv_label = (const unsigned char *)QUIC_HKDF_IV_LABEL_V2, .iv_label = (const unsigned char *)QUIC_HKDF_IV_LABEL_V2,
@ -104,8 +104,8 @@ const struct quic_version quic_versions[] = {
.hp_label_len = sizeof(QUIC_HKDF_HP_LABEL_V2) - 1, .hp_label_len = sizeof(QUIC_HKDF_HP_LABEL_V2) - 1,
.ku_label = (const unsigned char *)QUIC_HKDF_KU_LABEL_V2, .ku_label = (const unsigned char *)QUIC_HKDF_KU_LABEL_V2,
.ku_label_len = sizeof(QUIC_HKDF_KU_LABEL_V2) - 1, .ku_label_len = sizeof(QUIC_HKDF_KU_LABEL_V2) - 1,
.retry_tag_key = (const unsigned char *)QUIC_TLS_RETRY_KEY_V2_DRAFT, .retry_tag_key = (const unsigned char *)QUIC_TLS_RETRY_KEY_V2,
.retry_tag_nonce = (const unsigned char *)QUIC_TLS_RETRY_NONCE_V2_DRAFT, .retry_tag_nonce = (const unsigned char *)QUIC_TLS_RETRY_NONCE_V2,
}, },
}; };
@ -5341,7 +5341,7 @@ static inline int qc_parse_hd_form(struct quic_rx_packet *pkt,
goto out; goto out;
} }
if (*version != QUIC_PROTOCOL_VERSION_2_DRAFT) { if (*version != QUIC_PROTOCOL_VERSION_2) {
pkt->type = type; pkt->type = type;
} }
else { else {

8
src/quic_tls.c
View File

@ -31,10 +31,10 @@ const unsigned char initial_salt_v1[20] = {
0xcc, 0xbb, 0x7f, 0x0a 0xcc, 0xbb, 0x7f, 0x0a
}; };
const unsigned char initial_salt_v2_draft[20] = { const unsigned char initial_salt_v2[20] = {
0xa7, 0x07, 0xc2, 0x03, 0xa5, 0x9b, 0x47, 0x18, 0x0d, 0xed, 0xe3, 0xde, 0xf7, 0x00, 0xa6, 0xdb,
0x4a, 0x1d, 0x62, 0xca, 0x57, 0x04, 0x06, 0xea, 0x81, 0x93, 0x81, 0xbe, 0x6e, 0x26, 0x9d, 0xcb,
0x7a, 0xe3, 0xe5, 0xd3 0xf9, 0xbd, 0x2e, 0xd9
}; };
/* Dump the RX/TX secrets of <secs> QUIC TLS secrets. */ /* Dump the RX/TX secrets of <secs> QUIC TLS secrets. */