-
Notifications
You must be signed in to change notification settings - Fork 41
Expand file tree
/
Copy pathpq.py
More file actions
394 lines (339 loc) · 13.3 KB
/
Copy pathpq.py
File metadata and controls
394 lines (339 loc) · 13.3 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
"""PQDNSCrypt and X-Wing helpers."""
from __future__ import annotations
import hashlib
import os
from typing import Sequence
from cryptography.hazmat.primitives.asymmetric import mlkem, x25519
from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
from certificates import DNSCryptCertificate, parse_pq_profile_extension
from constants import (
CLIENT_NONCE_SIZE,
ES_VERSION_XWING,
MIN_UDP_QUERY_LEN,
PQ_CONTROL_MAGIC,
PQ_CONTROL_VERSION,
RESUME_MAGIC,
TAG_SIZE,
TICKET_KEY_ID_SIZE,
TICKET_NONCE_SIZE,
TICKET_PLAIN_SIZE,
XWING_CIPHERTEXT_SIZE,
XWING_LABEL,
XWING_MLKEM_CIPHERTEXT_SIZE,
XWING_MLKEM_PUBLIC_KEY_SIZE,
XWING_PUBLIC_KEY_SIZE,
)
from crypto import (
_require_size,
hkdf_sha256,
pad_7816_4,
query_nonce,
unpad_7816_4,
xchacha20_djb_poly1305_open,
xchacha20_djb_poly1305_seal,
)
from errors import CertificateError, DecryptionError
from packets import decrypt_dnscrypt_response, encrypt_dnscrypt_response
from protocol_types import (
DecryptedQuery,
IssuedPQTicket,
OpenedTicket,
PQDecryptedResponse,
PreparedQuery,
TicketKey,
XWingEncapsulation,
XWingKeyPair,
)
def _xwing_expand_decapsulation_key(secret_seed: bytes):
_require_size("secret_seed", secret_seed, 32)
expanded = hashlib.shake_256(secret_seed).digest(96)
mlkem_sk = mlkem.MLKEM768PrivateKey.from_seed_bytes(expanded[:64])
x25519_sk = x25519.X25519PrivateKey.from_private_bytes(expanded[64:96])
mlkem_pk = mlkem_sk.public_key().public_bytes_raw()
x25519_pk = x25519_sk.public_key().public_bytes(Encoding.Raw, PublicFormat.Raw)
return mlkem_sk, x25519_sk, mlkem_pk, x25519_pk
def xwing_generate_key_pair_derand(secret_seed: bytes) -> XWingKeyPair:
"""Generate an X-Wing key pair from a 32-byte seed."""
_, _, mlkem_pk, x25519_pk = _xwing_expand_decapsulation_key(secret_seed)
return XWingKeyPair(secret_seed=secret_seed, public_key=mlkem_pk + x25519_pk)
def xwing_generate_key_pair() -> XWingKeyPair:
"""Generate a fresh X-Wing key pair."""
return xwing_generate_key_pair_derand(os.urandom(32))
def _xwing_combiner(ss_m: bytes, ss_x: bytes, ct_x: bytes, pk_x: bytes) -> bytes:
return hashlib.sha3_256(ss_m + ss_x + ct_x + pk_x + XWING_LABEL).digest()
def xwing_encapsulate(public_key: bytes) -> XWingEncapsulation:
"""Encapsulate to an X-Wing public key using fresh randomness."""
_require_size("public_key", public_key, XWING_PUBLIC_KEY_SIZE)
pk_m = public_key[:XWING_MLKEM_PUBLIC_KEY_SIZE]
pk_x = public_key[XWING_MLKEM_PUBLIC_KEY_SIZE:]
ss_m, ct_m = mlkem.MLKEM768PublicKey.from_public_bytes(pk_m).encapsulate()
x_sk = x25519.X25519PrivateKey.generate()
ct_x = x_sk.public_key().public_bytes(Encoding.Raw, PublicFormat.Raw)
ss_x = x_sk.exchange(x25519.X25519PublicKey.from_public_bytes(pk_x))
return XWingEncapsulation(
shared_secret=_xwing_combiner(ss_m, ss_x, ct_x, pk_x),
ciphertext=ct_m + ct_x,
)
def xwing_decapsulate(encrypted_kem: bytes, secret_seed: bytes) -> bytes:
"""Decapsulate an X-Wing ciphertext with a 32-byte resolver seed."""
_require_size("encrypted_kem", encrypted_kem, XWING_CIPHERTEXT_SIZE)
mlkem_sk, x_sk, _, pk_x = _xwing_expand_decapsulation_key(secret_seed)
ct_m = encrypted_kem[:XWING_MLKEM_CIPHERTEXT_SIZE]
ct_x = encrypted_kem[XWING_MLKEM_CIPHERTEXT_SIZE:]
ss_m = mlkem_sk.decapsulate(ct_m)
ss_x = x_sk.exchange(x25519.X25519PublicKey.from_public_bytes(ct_x))
return _xwing_combiner(ss_m, ss_x, ct_x, pk_x)
def pq_cert_context(certificate: DNSCryptCertificate) -> bytes:
"""Build the PQ HKDF certificate context for a signed certificate."""
return (
b"DNSCrypt-PQ-v1"
+ certificate.es_version
+ certificate.protocol_minor_version
+ certificate.signed_data()
)
def pq_shared_key(
certificate: DNSCryptCertificate, kem_ss: bytes, client_kex: bytes
) -> bytes:
"""Derive PQDNSCrypt `<shared-key>` from X-Wing `<kem-ss>`."""
parse_pq_profile_extension(certificate.extensions, certificate.es_version)
return hkdf_sha256(
ikm=kem_ss,
salt=certificate.es_version + certificate.client_magic,
info=pq_cert_context(certificate) + client_kex,
length=32,
)
def encrypt_pq_dnscrypt_query(
certificate: DNSCryptCertificate,
client_query: bytes,
client_nonce: bytes | None = None,
min_query_len: int = 64,
) -> PreparedQuery:
"""Construct a PQ query carrying a full X-Wing ciphertext."""
if certificate.es_version != ES_VERSION_XWING:
raise CertificateError("encrypt_pq_dnscrypt_query expects es-version 0x0003")
if client_nonce is None:
client_nonce = os.urandom(CLIENT_NONCE_SIZE)
_require_size("client_nonce", client_nonce, CLIENT_NONCE_SIZE)
encapsulation = xwing_encapsulate(certificate.resolver_pk)
shared_key = pq_shared_key(
certificate, encapsulation.shared_secret, encapsulation.ciphertext
)
plaintext = pad_7816_4(client_query, min_query_len)
encrypted_query = xchacha20_djb_poly1305_seal(
shared_key, query_nonce(client_nonce), plaintext
)
return PreparedQuery(
dnscrypt_query=certificate.client_magic
+ encapsulation.ciphertext
+ client_nonce
+ encrypted_query,
shared_key=shared_key,
client_pk=encapsulation.ciphertext,
client_nonce=client_nonce,
)
def pq_resume_secret(
shared_key: bytes, client_magic: bytes, client_nonce: bytes
) -> bytes:
"""Derive the resumption secret after a full PQ query."""
return hkdf_sha256(
ikm=shared_key,
salt=client_magic + client_nonce,
info=b"DNSCrypt-PQ-resume-secret-v1",
length=32,
)
def issue_pq_ticket(
certificate: DNSCryptCertificate,
shared_key: bytes,
client_nonce: bytes,
ticket_key: TicketKey,
ticket_nonce: bytes,
ticket_expiry: int,
ticket_lifetime: int,
) -> IssuedPQTicket:
"""Seal a stateless PQ resumption ticket and response control block."""
_require_size("ticket_key_id", ticket_key.ticket_key_id, TICKET_KEY_ID_SIZE)
_require_size("ticket_key", ticket_key.ticket_key, 32)
_require_size("ticket_nonce", ticket_nonce, TICKET_NONCE_SIZE)
resume_secret = pq_resume_secret(shared_key, certificate.client_magic, client_nonce)
profile_extension_hash = hashlib.sha256(certificate.extensions).digest()
ticket_plain = (
resume_secret
+ certificate.es_version
+ certificate.client_magic
+ certificate.serial.to_bytes(4, "big")
+ certificate.ts_end.to_bytes(4, "big")
+ ticket_expiry.to_bytes(4, "big")
+ profile_extension_hash
)
if len(ticket_plain) != TICKET_PLAIN_SIZE:
raise AssertionError("ticket-plain size changed")
ticket = (
ticket_key.ticket_key_id
+ ticket_nonce
+ xchacha20_djb_poly1305_seal(ticket_key.ticket_key, ticket_nonce, ticket_plain)
)
control = (
PQ_CONTROL_MAGIC
+ bytes([PQ_CONTROL_VERSION])
+ ticket_lifetime.to_bytes(4, "big")
+ len(ticket).to_bytes(2, "big")
+ ticket
)
return IssuedPQTicket(resume_secret=resume_secret, ticket=ticket, control=control)
def encrypt_pq_dnscrypt_response(
resolver_response: bytes,
shared_key: bytes,
client_nonce: bytes,
resolver_nonce: bytes | None = None,
control: bytes = b"",
minimum_length: int = 64,
) -> bytes:
"""Construct a PQ response with `<control-len> <control>` in plaintext."""
if len(control) > 0xFFFF:
raise ValueError("control block is too large")
plaintext = len(control).to_bytes(2, "big") + control + resolver_response
return encrypt_dnscrypt_response(
plaintext,
shared_key,
client_nonce,
resolver_nonce=resolver_nonce,
minimum_length=minimum_length,
)
def decrypt_pq_dnscrypt_response(
dnscrypt_response: bytes,
shared_key: bytes,
expected_client_nonce: bytes,
) -> PQDecryptedResponse:
"""Open a PQ response and split its control block from the DNS response."""
plaintext = decrypt_dnscrypt_response(
dnscrypt_response, shared_key, expected_client_nonce
)
if len(plaintext) < 2:
raise DecryptionError("PQ response plaintext is too short")
control_len = int.from_bytes(plaintext[:2], "big")
if len(plaintext) < 2 + control_len:
raise DecryptionError("PQ control block is truncated")
return PQDecryptedResponse(
control=plaintext[2 : 2 + control_len],
resolver_response=plaintext[2 + control_len :],
)
def pq_resumed_shared_key(
resume_secret: bytes, client_magic: bytes, client_nonce: bytes, ticket: bytes
) -> bytes:
"""Derive the per-query key for a resumed PQ query."""
return hkdf_sha256(
ikm=resume_secret,
salt=client_magic + client_nonce,
info=b"DNSCrypt-PQ-resumed-query-v1" + hashlib.sha256(ticket).digest(),
length=32,
)
def encrypt_pq_resume_query(
ticket: bytes,
resume_secret: bytes,
client_magic: bytes,
client_query: bytes,
client_nonce: bytes | None = None,
min_query_len: int = MIN_UDP_QUERY_LEN,
) -> PreparedQuery:
"""Construct `<pq-resume-query>`."""
if client_nonce is None:
client_nonce = os.urandom(CLIENT_NONCE_SIZE)
_require_size("client_nonce", client_nonce, CLIENT_NONCE_SIZE)
if len(ticket) > 0xFFFF:
raise ValueError("ticket is too large")
shared_key = pq_resumed_shared_key(resume_secret, client_magic, client_nonce, ticket)
plaintext = pad_7816_4(client_query, min_query_len)
encrypted_query = xchacha20_djb_poly1305_seal(
shared_key, query_nonce(client_nonce), plaintext
)
return PreparedQuery(
dnscrypt_query=RESUME_MAGIC
+ len(ticket).to_bytes(2, "big")
+ ticket
+ client_nonce
+ encrypted_query,
shared_key=shared_key,
client_pk=ticket,
client_nonce=client_nonce,
)
def open_pq_ticket(
ticket: bytes,
ticket_keys: Sequence[TicketKey],
) -> OpenedTicket:
"""Open a PQ resumption ticket with one of the active ticket keys."""
if len(ticket) < TICKET_KEY_ID_SIZE + TICKET_NONCE_SIZE + TAG_SIZE:
raise DecryptionError("ticket is too short")
ticket_key_id = ticket[:TICKET_KEY_ID_SIZE]
ticket_nonce = ticket[TICKET_KEY_ID_SIZE : TICKET_KEY_ID_SIZE + TICKET_NONCE_SIZE]
sealed = ticket[TICKET_KEY_ID_SIZE + TICKET_NONCE_SIZE :]
match = next((tk for tk in ticket_keys if tk.ticket_key_id == ticket_key_id), None)
if match is None:
raise DecryptionError("unknown ticket-key-id")
ticket_plain = xchacha20_djb_poly1305_open(match.ticket_key, ticket_nonce, sealed)
if len(ticket_plain) != TICKET_PLAIN_SIZE:
raise DecryptionError("ticket plaintext has an invalid length")
return OpenedTicket(
resume_secret=ticket_plain[:32],
es_version=ticket_plain[32:34],
client_magic=ticket_plain[34:42],
serial=int.from_bytes(ticket_plain[42:46], "big"),
ts_end=int.from_bytes(ticket_plain[46:50], "big"),
ticket_expiry=int.from_bytes(ticket_plain[50:54], "big"),
profile_extension_hash=ticket_plain[54:86],
)
def _ticket_matches_certificate(
opened_ticket: OpenedTicket, certificate: DNSCryptCertificate
) -> bool:
return (
opened_ticket.es_version == certificate.es_version
and opened_ticket.client_magic == certificate.client_magic
and opened_ticket.serial == certificate.serial
and opened_ticket.ts_end == certificate.ts_end
and opened_ticket.profile_extension_hash
== hashlib.sha256(certificate.extensions).digest()
)
def decrypt_pq_resume_query(
pq_resume_query: bytes,
ticket_keys: Sequence[TicketKey],
certificates: Sequence[DNSCryptCertificate],
now: int,
) -> DecryptedQuery:
"""Open a resumed PQ query after validating its ticket context."""
if not pq_resume_query.startswith(RESUME_MAGIC):
raise DecryptionError("invalid resume magic")
if len(pq_resume_query) < len(RESUME_MAGIC) + 2:
raise DecryptionError("resume query is too short")
ticket_len = int.from_bytes(
pq_resume_query[len(RESUME_MAGIC) : len(RESUME_MAGIC) + 2], "big"
)
ticket_start = len(RESUME_MAGIC) + 2
ticket_end = ticket_start + ticket_len
header_len = ticket_end + CLIENT_NONCE_SIZE
if len(pq_resume_query) < header_len + TAG_SIZE:
raise DecryptionError("resume query is truncated")
ticket = pq_resume_query[ticket_start:ticket_end]
client_nonce = pq_resume_query[ticket_end:header_len]
opened = open_pq_ticket(ticket, ticket_keys)
if now > opened.ticket_expiry:
raise DecryptionError("ticket is expired")
certificate = next(
(c for c in certificates if _ticket_matches_certificate(opened, c)),
None,
)
if certificate is None:
raise DecryptionError("ticket context does not match any certificate")
shared_key = pq_resumed_shared_key(
opened.resume_secret, opened.client_magic, client_nonce, ticket
)
plaintext = xchacha20_djb_poly1305_open(
shared_key,
query_nonce(client_nonce),
pq_resume_query[header_len:],
)
return DecryptedQuery(
client_query=unpad_7816_4(plaintext),
shared_key=shared_key,
client_pk=ticket,
client_nonce=client_nonce,
certificate=certificate,
)