Commit3ddcf1afRecorded18 Oct 2026Repositorysigil-quic

Pin TLS HRR choices and low-order share rejection

Changed
 scripts/inject-retry-faults.mjs |  30 ++++++++++++++++++++++
 scripts/native-tls-tests.mjs    |   7 ++++-
 test/test-tls-retry-policy.sgl  | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 260 insertions(+), 1 deletion(-)
Diff
scripts/inject-retry-faults.mjsadded
@@ -0,0 +1,30 @@
+1
// Remote-only sensitivity checks. Restore canonical TLS before full gates.
+2
import { readFileSync, writeFileSync } from 'node:fs';
+3
+4
const [input, output] = process.argv.slice(2);
+5
if (!input || !output || input === output) {
+6
throw new Error('Usage: inject-retry-faults.mjs INPUT OUTPUT');
+7
}
+8
let source = readFileSync(input, 'utf8');
+9
if (source.includes('TEST ONLY')) throw new Error('Expected canonical handshake source');
+10
function replaceOnce(before, after) {
+11
if (source.split(before).length !== 2) throw new Error('Expected one canonical HRR guard');
+12
source = source.replace(before, () => after);
+13
}
+14
replaceOnce(` (unless (and (= (tls-server-hello-cipher-suite hello) 4865)
+15
(bytes=? (tls-server-hello-session-id hello)
+16
(tls-client-hello-session-id (tls-handshake-hello engine)))
+17
(bytes=? (extension extensions 43) #u8(3 4)))
+18
(error "TLS: invalid ServerHello selection"))`, ' #t');
+19
replaceOnce(' (unless (or group cookie) (error "TLS: HelloRetryRequest makes no change"))', ' #t');
+20
replaceOnce(` (unless (and share (= (length shares) 1)
+21
(not (assoc 42 extensions))
+22
(psk-identities-subsequence? identities
+23
(client-psk-identities
+24
(tls-client-hello-extensions (tls-handshake-hello engine))))
+25
(bytes=? (immutable-client-hello hello)
+26
(immutable-client-hello (tls-handshake-hello engine))))
+27
(raise-tls-alert 47 "TLS: illegal second ClientHello change"))`, ' #t');
+28
replaceOnce(' (unless shared (error "TLS: invalid X25519 peer key"))',
+29
' (unless shared (set! shared (make-bytevector 32 0)))');
+30
writeFileSync(output, ';;; TEST ONLY: HRR and rejected-DH guards weakened for sensitivity.\n' + source);
scripts/native-tls-tests.mjsmodified
@@ -14,6 +14,7 @@ const files = [
14
'test-tls-seen.sgl',
15
'test-tls-negotiation.sgl',
16
'test-tls-certificate-policy.sgl',
+17
'test-tls-retry-policy.sgl',
18
'test-tls-authentication.sgl', 'test-tls-handshake.sgl',
19
'test-tls-input-bounds.sgl',
20
'test-tls-alerts.sgl',
@@ -62,7 +63,8 @@ const seenBudget = process.argv.includes('--seen-budget');
63
const ticketValidation = process.argv.includes('--ticket-validation');
64
const negotiation = process.argv.includes('--negotiation');
65
const certificatePolicy = process.argv.includes('--certificate-policy');
−65
if ([cleanupFaults, secretCleanup, secretRetention, handshakeCleanup, packetRetention, factoryCleanup, eventCleanup, constructionCleanup, pathResponse, cidZero, cidSequence, handlerReadiness, seenBudget, ticketValidation, negotiation, certificatePolicy].filter(Boolean).length > 1) {
+66
const retryPolicy = process.argv.includes('--retry-policy');
+67
if ([cleanupFaults, secretCleanup, secretRetention, handshakeCleanup, packetRetention, factoryCleanup, eventCleanup, constructionCleanup, pathResponse, cidZero, cidSequence, handlerReadiness, seenBudget, ticketValidation, negotiation, certificatePolicy, retryPolicy].filter(Boolean).length > 1) {
68
throw new Error('Select one focused test suite');
69
}
70
if (cleanupFaults) {
@@ -113,6 +115,9 @@ if (negotiation) {
115
if (certificatePolicy) {
116
files.splice(0, files.length, 'test-tls-certificate-policy.sgl');
117
}
+118
if (retryPolicy) {
+119
files.splice(0, files.length, 'test-tls-retry-policy.sgl');
+120
}
121
const bodies = files.map(file => {
122
const text = readFileSync(join(root, 'test', file), 'utf8');
123
const boundary = text.indexOf('\n\n');
test/test-tls-retry-policy.sgladded
@@ -0,0 +1,224 @@
+1
(import (sigil test)
+2
(sigil crypto)
+3
(sigil quic bytes)
+4
(sigil quic tls)
+5
(sigil quic tls codec)
+6
(sigil quic tls messages)
+7
(sigil quic tls extensions))
+8
+9
(define ql13r-random
+10
(hex->bytes "cf21ad74e59a6111be1d8c021e65b891c2a211167abb8c5e079e09e2c8a8339c"))
+11
+12
(define (ql13r-wipe! bytes)
+13
(when (bytevector? bytes)
+14
(do ((i 0 (+ i 1))) ((= i (bytevector-length bytes)))
+15
(bytevector-u8-set! bytes i 0))))
+16
+17
(define (ql13r-take! engine)
+18
(let ((events (tls-take-events! engine)))
+19
(for-each
+20
(lambda (event)
+21
(when (eq? (tls-event-kind event) 'secrets)
+22
(ql13r-wipe! (car (tls-event-data event)))
+23
(ql13r-wipe! (cdr (tls-event-data event)))))
+24
events)
+25
events))
+26
+27
(define (ql13r-message events type)
+28
(let ((matches
+29
(filter
+30
(lambda (event)
+31
(and (eq? (tls-event-kind event) 'crypto)
+32
(= type (bytevector-u8-ref (tls-event-data event) 0))))
+33
events)))
+34
(unless (= 1 (length matches))
+35
(error "HRR fixture did not produce the expected message" type))
+36
(tls-event-data (car matches))))
+37
+38
(define (ql13r-with-pair defer? procedure)
+39
(let ((key (ecdsa-p256-generate-keypair)) (client #f) (server #f))
+40
(dynamic-wind
+41
(lambda () #t)
+42
(lambda ()
+43
(set! client
+44
(make-tls-client (list #u8(113 49)) "retry.test" (list (cons 15 #u8(1)))
+45
(lambda (chain name)
+46
(and (equal? chain (list #u8(48 1 0))) (equal? name "retry.test") (cdr key)))
+47
defer-key-share?: defer?))
+48
(set! server
+49
(make-tls-server (list #u8(113 49))
+50
(list (cons 0 #u8(9)) (cons 15 #u8(2))) (list #u8(48 1 0)) (car key)))
+51
(tls-bind-peer! client #u8(9) #u8(2) #f)
+52
(tls-bind-peer! server #u8(9) #u8(1) #f)
+53
(procedure client server))
+54
(lambda ()
+55
(when client (ql13r-take! client) (tls-abort! client))
+56
(when server (ql13r-take! server) (tls-abort! server))
+57
(ql13r-wipe! (car key))))))
+58
+59
(define (ql13r-start! client)
+60
(tls-start! client)
+61
(ql13r-message (ql13r-take! client) 1))
+62
+63
(define (ql13r-rejected! engine wire reason (keys: (alert #f)))
+64
(let* ((failure (guard (exn (else exn)) (tls-input! engine 'initial wire) #f))
+65
(events (ql13r-take! engine)))
+66
(assert-true
+67
(and (error-object? failure)
+68
(equal? reason (error-object-message failure))
+69
(or (not alert) (and (tls-alert? failure) (= alert (tls-alert-code failure))))
+70
(tls-failed? engine)
+71
(null? events)
+72
(not (tls-peer-parameters engine))
+73
(not (tls-negotiated-alpn engine))))))
+74
+75
(define (ql13r-retry extensions (keys: (suite 4865) (session #u8())))
+76
(encode-server-hello ql13r-random session suite
+77
(append (list (cons 43 #u8(3 4))) extensions)))
+78
+79
(define (ql13r-bad-retry! mode)
+80
(ql13r-with-pair #f
+81
(lambda (client server)
+82
(ql13r-start! client)
+83
(ql13r-rejected! client
+84
(case mode
+85
((no-change) (ql13r-retry '()))
+86
((suite) (ql13r-retry (list (cons 44 (encode-cookie #u8(7)))) suite: 4866))
+87
((session) (ql13r-retry (list (cons 44 (encode-cookie #u8(7)))) session: #u8(1))))
+88
(if (eq? mode 'no-change)
+89
"TLS: HelloRetryRequest makes no change"
+90
"TLS: invalid ServerHello selection")))))
+91
+92
(define (ql13r-with-second procedure)
+93
(ql13r-with-pair #t
+94
(lambda (client server)
+95
(let* ((first (ql13r-start! client))
+96
(hello (decode-client-hello first)))
+97
(unless (null? (decode-client-key-shares (cdr (assoc 51 (tls-client-hello-extensions hello)))))
+98
(error "HRR fixture first ClientHello already had a share"))
+99
(tls-input! server 'initial first)
+100
(tls-input! client 'initial (ql13r-message (ql13r-take! server) 2))
+101
(let* ((wire (ql13r-message (ql13r-take! client) 1))
+102
(second (decode-client-hello wire)))
+103
(unless (and (eq? (tls-state server) 'client-hello)
+104
(= 1 (length (decode-client-key-shares
+105
(cdr (assoc 51 (tls-client-hello-extensions second)))))))
+106
(error "HRR fixture did not produce the requested second share"))
+107
(procedure server second))))))
+108
+109
(define (ql13r-client-wire hello random suites entries)
+110
(encode-client-hello random (tls-client-hello-session-id hello) suites entries))
+111
+112
(define (ql13r-replace entries id data)
+113
(map (lambda (entry) (if (= id (car entry)) (cons id data) entry)) entries))
+114
+115
(define (ql13r-bad-second! mode)
+116
(ql13r-with-second
+117
(lambda (server hello)
+118
(let ((random (bytevector-copy (tls-client-hello-random hello)))
+119
(suites (tls-client-hello-cipher-suites hello))
+120
(entries (tls-client-hello-extensions hello)))
+121
(case mode
+122
((random)
+123
(bytevector-u8-set! random 0 (modulo (+ 1 (bytevector-u8-ref random 0)) 256)))
+124
((suites) (set! suites (bytes-append suites #u8(19 2))))
+125
((no-share) (set! entries (ql13r-replace entries 51 (encode-client-key-shares '())))))
+126
(ql13r-rejected! server (ql13r-client-wire hello random suites entries)
+127
"TLS: illegal second ClientHello change" alert: 47)))))
+128
+129
(define (ql13r-low-order! role)
+130
(for-each
+131
(lambda (first-byte)
+132
(ql13r-with-pair #f
+133
(lambda (client server)
+134
(let ((hello-wire (ql13r-start! client)) (share (make-bytevector 32 0)))
+135
(bytevector-u8-set! share 0 first-byte)
+136
(if (eq? role 'server)
+137
(let ((hello (decode-client-hello hello-wire)))
+138
(ql13r-rejected! server
+139
(ql13r-client-wire hello (tls-client-hello-random hello)
+140
(tls-client-hello-cipher-suites hello)
+141
(ql13r-replace (tls-client-hello-extensions hello) 51
+142
(encode-client-key-shares (list (cons 29 share)))))
+143
"TLS: invalid X25519 peer key"))
+144
(begin
+145
(tls-input! server 'initial hello-wire)
+146
(let ((hello (decode-server-hello (ql13r-message (ql13r-take! server) 2))))
+147
(ql13r-rejected! client
+148
(encode-server-hello (tls-server-hello-random hello)
+149
(tls-server-hello-session-id hello) (tls-server-hello-cipher-suite hello)
+150
(ql13r-replace (tls-server-hello-extensions hello) 51 (encode-key-share 29 share)))
+151
"TLS: invalid X25519 peer key"))))))))
+152
'(0 1)))
+153
+154
(define (ql13r-deliver! source target)
+155
(for-each
+156
(lambda (event)
+157
(when (eq? (tls-event-kind event) 'crypto)
+158
(tls-input! target (tls-event-level event) (tls-event-data event))))
+159
(ql13r-take! source)))
+160
+161
(define (ql13r-complete! defer?)
+162
(ql13r-with-pair defer?
+163
(lambda (client server)
+164
(tls-start! client)
+165
(do ((round 0 (+ round 1))) ((= round 4))
+166
(ql13r-deliver! client server)
+167
(ql13r-deliver! server client))
+168
(assert-true (tls-complete? client))
+169
(assert-true (tls-complete? server))
+170
(assert-equal #u8(113 49) (tls-negotiated-alpn client))
+171
(assert-equal #u8(2) (cdr (assoc 15 (tls-peer-parameters client)))))))
+172
+173
(test-group "HRR choices, immutable ClientHello2 and low-order shares"
+174
(test "ql13-retry: HRR must change a group or provide a cookie"
+175
(ql13r-bad-retry! 'no-change))
+176
(test "ql13-retry: HRR cannot select a different cipher suite"
+177
(ql13r-bad-retry! 'suite))
+178
(test "ql13-retry: HRR cannot echo a different session ID"
+179
(ql13r-bad-retry! 'session))
+180
(test "ql13-retry: second ClientHello cannot change its random"
+181
(ql13r-bad-second! 'random))
+182
(test "ql13-retry: second ClientHello cannot change its cipher list"
+183
(ql13r-bad-second! 'suites))
+184
(test "ql13-retry: second ClientHello must supply the requested share with alert 47"
+185
(ql13r-bad-second! 'no-share))
+186
(test "ql13-retry: client rejects both low-order peer shares before secret release"
+187
(ql13r-low-order! 'client))
+188
(test "ql13-retry: server rejects both low-order peer shares and clears its queued hello"
+189
(ql13r-low-order! 'server))
+190
(test "ql13-retry-control: cookie-only HRR preserves the share and echoes the cookie"
+191
(ql13r-with-pair #f
+192
(lambda (client server)
+193
(let* ((first (decode-client-hello (ql13r-start! client)))
+194
(cookie #u8(0 1 0 255))
+195
(retry (ql13r-retry (list (cons 44 (encode-cookie cookie))))))
+196
(do ((i 0 (+ i 1))) ((= i (bytevector-length retry)))
+197
(tls-input! client 'initial (bytevector-copy retry i (+ i 1))))
+198
(let* ((events (ql13r-take! client))
+199
(second (decode-client-hello (ql13r-message events 1)))
+200
(entries (tls-client-hello-extensions second)))
+201
(assert-equal 1 (length events))
+202
(assert-equal 'server-hello (tls-state client))
+203
(assert-equal (tls-client-hello-random first) (tls-client-hello-random second))
+204
(assert-equal (tls-client-hello-session-id first) (tls-client-hello-session-id second))
+205
(assert-equal (tls-client-hello-cipher-suites first) (tls-client-hello-cipher-suites second))
+206
(assert-equal cookie (decode-cookie (cdr (assoc 44 entries))))
+207
(assert-equal (tls-client-hello-extensions first)
+208
(filter (lambda (entry) (not (= 44 (car entry)))) entries)))))))
+209
(test "ql13-retry-control: ordinary handshake still authenticates"
+210
(ql13r-complete! #f))
+211
(test "ql13-retry-control: legitimate group HRR still authenticates"
+212
(ql13r-complete! #t))
+213
(test "ql13-retry-control: second ClientHello may change padding"
+214
(ql13r-with-second
+215
(lambda (server hello)
+216
(tls-input! server 'initial
+217
(ql13r-client-wire hello (tls-client-hello-random hello)
+218
(tls-client-hello-cipher-suites hello)
+219
(append (tls-client-hello-extensions hello) (list (cons 21 #u8(0 0))))))
+220
(let ((events (ql13r-take! server)))
+221
(assert-equal 'client-finished (tls-state server))
+222
(assert-false (tls-failed? server))
+223
(assert-true (any (lambda (event) (eq? (tls-event-kind event) 'secrets)) events))
+224
(assert-true (bytevector? (ql13r-message events 2))))))))