Skip to content

fix(quic): reject oversized Retry tokens #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alanhoff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(quic): reject oversized Retry tokens #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/quic/packet.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,9 +799,11 @@ pub fn validateRetryToken(
token_key: [crypto.key_len]u8,
) !?ValidatedToken {
if (token_data.len < TOKEN_NONCE_LEN + TOKEN_TAG_LEN + 2) return null;
if (token_data.len > TOKEN_MAX_LEN) return null;

const nonce = token_data[0..TOKEN_NONCE_LEN].*;
const ct_len = token_data.len - TOKEN_NONCE_LEN - TOKEN_TAG_LEN;
if (ct_len > TOKEN_MAX_PLAINTEXT_LEN) return null;
const ciphertext = token_data[TOKEN_NONCE_LEN..][0..ct_len];
const tag = token_data[token_data.len - TOKEN_TAG_LEN ..][0..TOKEN_TAG_LEN].*;

Expand Down Expand Up @@ -1130,6 +1132,18 @@ test "Retry token: wrong key rejected" {
try std.testing.expect(validated == null);
}

test "Retry token: oversized token rejected before decrypt" {
var token_key: [crypto.key_len]u8 = undefined;
random.bytes(&token_key);

var addr: posix.sockaddr.storage = std.mem.zeroes(posix.sockaddr.storage);
addr.family = posix.AF.INET;

var oversized: [TOKEN_MAX_LEN + 1]u8 = .{0} ** (TOKEN_MAX_LEN + 1);
const validated = try validateRetryToken(&oversized, addr, token_key);
try std.testing.expect(validated == null);
}

// Retry integrity tag verification
test "Retry: integrity tag compute and verify" {
const odcid = &[_]u8{ 0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08 };
Expand Down
Loading