From e23507d3e97ce37bb15be59de5195336595cdb17 Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Wed, 2 Mar 2022 15:14:57 +0100 Subject: [PATCH] Internal crypto: increase size of authentication buffer (#1468) Some QUIC flows are not properly decoded while using internal crypto code: the authentication buffer is too small. The new value (like the old one) is arbitrary. Close #1463 --- src/lib/third_party/include/gcrypt_light.h | 2 +- tests/pcap/quic_crypto_aes_auth_size.pcap | Bin 0 -> 2840 bytes tests/result/quic_crypto_aes_auth_size.pcap.out | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tests/pcap/quic_crypto_aes_auth_size.pcap create mode 100644 tests/result/quic_crypto_aes_auth_size.pcap.out diff --git a/src/lib/third_party/include/gcrypt_light.h b/src/lib/third_party/include/gcrypt_light.h index de77c8e38..7f31f24a0 100644 --- a/src/lib/third_party/include/gcrypt_light.h +++ b/src/lib/third_party/include/gcrypt_light.h @@ -24,7 +24,7 @@ #define GCRYCTL_RESET 3 #define GCRY_AES_KEY_SIZE 32 -#define GCRY_AES_AUTH_SIZE 128 +#define GCRY_AES_AUTH_SIZE 256 #define GCRY_AES_TAG_SIZE 32 #define GCRY_AES_IV_SIZE 12 diff --git a/tests/pcap/quic_crypto_aes_auth_size.pcap b/tests/pcap/quic_crypto_aes_auth_size.pcap new file mode 100644 index 0000000000000000000000000000000000000000..f399daa2505fd411ebe594c96c619668d904aaa0 GIT binary patch literal 2840 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 142.104.38.30:443 [proto: 188.199/QUIC.Snapchat][Encrypted][Confidence: DPI][cat: SocialNetwork/6][1 pkts/1392 bytes -> 0 pkts/0 bytes][Goodput ratio: 97/0][< 1 sec][Hostname/SNI: app-analytics-v2.snapchat.com][ALPN: h3][TLS Supported Versions: TLSv1.3][TLSv1.3][JA3C: 1b4b6c50fef204e06798d3fc7cb272fe][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0] + 2 UDP 245.161.134.177:27636 -> 77.242.114.14:443 [proto: 188.199/QUIC.Snapchat][Encrypted][Confidence: DPI][cat: SocialNetwork/6][1 pkts/1392 bytes -> 0 pkts/0 bytes][Goodput ratio: 97/0][< 1 sec][Hostname/SNI: gcp.api.snapchat.com][ALPN: h3][TLS Supported Versions: TLSv1.3][TLSv1.3][JA3C: c570fdf41c8bf336ac9442888680bf3a][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0]