sergio/takana

1diff --git a/Cargo.lock b/Cargo.lock
2index b491b7c..c9c9e3e 100644
3--- a/Cargo.lock
4+++ b/Cargo.lock
5@@ -187,16 +187,7 @@ version = "3.0.0"
6 source = "registry+https://github.com/rust-lang/crates.io-index"
7 checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
8 dependencies = [
9- "term 0.7.0",
10-]
11-
12-[[package]]
13-name = "ascii-canvas"
14-version = "4.0.0"
15-source = "registry+https://github.com/rust-lang/crates.io-index"
16-checksum = "ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891"
17-dependencies = [
18- "term 1.0.1",
19+ "term",
20 ]
21 
22 [[package]]
23@@ -291,7 +282,7 @@ dependencies = [
24  "bitflags",
25  "cexpr",
26  "clang-sys",
27- "itertools 0.13.0",
28+ "itertools",
29  "proc-macro2",
30  "quote",
31  "regex",
32@@ -306,16 +297,7 @@ version = "0.5.3"
33 source = "registry+https://github.com/rust-lang/crates.io-index"
34 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
35 dependencies = [
36- "bit-vec 0.6.3",
37-]
38-
39-[[package]]
40-name = "bit-set"
41-version = "0.8.0"
42-source = "registry+https://github.com/rust-lang/crates.io-index"
43-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
44-dependencies = [
45- "bit-vec 0.8.0",
46+ "bit-vec",
47 ]
48 
49 [[package]]
50@@ -324,18 +306,24 @@ version = "0.6.3"
51 source = "registry+https://github.com/rust-lang/crates.io-index"
52 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
53 
54-[[package]]
55-name = "bit-vec"
56-version = "0.8.0"
57-source = "registry+https://github.com/rust-lang/crates.io-index"
58-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
59-
60 [[package]]
61 name = "bitflags"
62 version = "2.9.0"
63 source = "registry+https://github.com/rust-lang/crates.io-index"
64 checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
65 
66+[[package]]
67+name = "bitvec"
68+version = "1.0.1"
69+source = "registry+https://github.com/rust-lang/crates.io-index"
70+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
71+dependencies = [
72+ "funty",
73+ "radium",
74+ "tap",
75+ "wyz",
76+]
77+
78 [[package]]
79 name = "blake2"
80 version = "0.10.6"
81@@ -505,6 +493,15 @@ dependencies = [
82  "cipher",
83 ]
84 
85+[[package]]
86+name = "cbc"
87+version = "0.1.2"
88+source = "registry+https://github.com/rust-lang/crates.io-index"
89+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
90+dependencies = [
91+ "cipher",
92+]
93+
94 [[package]]
95 name = "cc"
96 version = "1.2.16"
97@@ -769,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
98 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
99 dependencies = [
100  "generic-array",
101- "rand_core",
102+ "rand_core 0.6.4",
103  "subtle",
104  "zeroize",
105 ]
106@@ -781,7 +778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
107 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
108 dependencies = [
109  "generic-array",
110- "rand_core",
111+ "rand_core 0.6.4",
112  "typenum",
113 ]
114 
115@@ -860,6 +857,21 @@ dependencies = [
116  "cfg-if",
117 ]
118 
119+[[package]]
120+name = "cx448"
121+version = "0.1.1"
122+source = "registry+https://github.com/rust-lang/crates.io-index"
123+checksum = "b4c0cf476284b03eb6c10e78787b21c7abb7d7d43cb2f02532ba6b831ed892fa"
124+dependencies = [
125+ "crypto-bigint",
126+ "elliptic-curve",
127+ "rand_core 0.6.4",
128+ "sha3",
129+ "signature",
130+ "subtle",
131+ "zeroize",
132+]
133+
134 [[package]]
135 name = "data-encoding"
136 version = "2.8.0"
137@@ -1099,7 +1111,7 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
138 dependencies = [
139  "curve25519-dalek",
140  "ed25519",
141- "rand_core",
142+ "rand_core 0.6.4",
143  "serde",
144  "sha2",
145  "subtle",
146@@ -1119,6 +1131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
147 checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
148 dependencies = [
149  "base16ct",
150+ "base64ct",
151  "crypto-bigint",
152  "digest",
153  "ff",
154@@ -1127,9 +1140,12 @@ dependencies = [
155  "hkdf",
156  "pem-rfc7468",
157  "pkcs8",
158- "rand_core",
159+ "rand_core 0.6.4",
160  "sec1",
161+ "serde_json",
162+ "serdect",
163  "subtle",
164+ "tap",
165  "zeroize",
166 ]
167 
168@@ -1255,7 +1271,8 @@ version = "0.13.0"
169 source = "registry+https://github.com/rust-lang/crates.io-index"
170 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
171 dependencies = [
172- "rand_core",
173+ "bitvec",
174+ "rand_core 0.6.4",
175  "subtle",
176 ]
177 
178@@ -1283,12 +1300,6 @@ version = "0.4.2"
179 source = "registry+https://github.com/rust-lang/crates.io-index"
180 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
181 
182-[[package]]
183-name = "fixedbitset"
184-version = "0.5.7"
185-source = "registry+https://github.com/rust-lang/crates.io-index"
186-checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
187-
188 [[package]]
189 name = "flate2"
190 version = "1.1.0"
191@@ -1368,6 +1379,12 @@ version = "1.3.0"
192 source = "registry+https://github.com/rust-lang/crates.io-index"
193 checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
194 
195+[[package]]
196+name = "funty"
197+version = "2.0.0"
198+source = "registry+https://github.com/rust-lang/crates.io-index"
199+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
200+
201 [[package]]
202 name = "futures"
203 version = "0.3.31"
204@@ -1578,7 +1595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
205 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
206 dependencies = [
207  "ff",
208- "rand_core",
209+ "rand_core 0.6.4",
210  "subtle",
211 ]
212 
213@@ -1650,7 +1667,7 @@ dependencies = [
214  "hickory-proto",
215  "once_cell",
216  "radix_trie",
217- "rand",
218+ "rand 0.8.5",
219  "thiserror 1.0.69",
220  "tokio",
221  "tracing",
222@@ -1673,7 +1690,7 @@ dependencies = [
223  "ipnet",
224  "once_cell",
225  "openssl",
226- "rand",
227+ "rand 0.8.5",
228  "thiserror 1.0.69",
229  "tinyvec",
230  "tokio",
231@@ -1694,7 +1711,7 @@ dependencies = [
232  "lru-cache",
233  "once_cell",
234  "parking_lot",
235- "rand",
236+ "rand 0.8.5",
237  "resolv-conf",
238  "smallvec",
239  "thiserror 1.0.69",
240@@ -1720,15 +1737,6 @@ dependencies = [
241  "digest",
242 ]
243 
244-[[package]]
245-name = "home"
246-version = "0.5.9"
247-source = "registry+https://github.com/rust-lang/crates.io-index"
248-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
249-dependencies = [
250- "windows-sys 0.52.0",
251-]
252-
253 [[package]]
254 name = "hostname"
255 version = "0.3.1"
256@@ -2129,24 +2137,6 @@ dependencies = [
257  "either",
258 ]
259 
260-[[package]]
261-name = "itertools"
262-version = "0.13.0"
263-source = "registry+https://github.com/rust-lang/crates.io-index"
264-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
265-dependencies = [
266- "either",
267-]
268-
269-[[package]]
270-name = "itertools"
271-version = "0.14.0"
272-source = "registry+https://github.com/rust-lang/crates.io-index"
273-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
274-dependencies = [
275- "either",
276-]
277-
278 [[package]]
279 name = "itoa"
280 version = "1.0.14"
281@@ -2178,42 +2168,21 @@ version = "0.20.2"
282 source = "registry+https://github.com/rust-lang/crates.io-index"
283 checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
284 dependencies = [
285- "ascii-canvas 3.0.0",
286- "bit-set 0.5.3",
287+ "ascii-canvas",
288+ "bit-set",
289  "ena",
290- "itertools 0.11.0",
291- "lalrpop-util 0.20.2",
292- "petgraph 0.6.5",
293+ "itertools",
294+ "lalrpop-util",
295+ "petgraph",
296  "regex",
297  "regex-syntax 0.8.5",
298  "string_cache",
299- "term 0.7.0",
300+ "term",
301  "tiny-keccak",
302  "unicode-xid",
303  "walkdir",
304 ]
305 
306-[[package]]
307-name = "lalrpop"
308-version = "0.22.1"
309-source = "registry+https://github.com/rust-lang/crates.io-index"
310-checksum = "7047a26de42016abf8f181b46b398aef0b77ad46711df41847f6ed869a2a1d5b"
311-dependencies = [
312- "ascii-canvas 4.0.0",
313- "bit-set 0.8.0",
314- "ena",
315- "itertools 0.14.0",
316- "lalrpop-util 0.22.1",
317- "petgraph 0.7.1",
318- "regex",
319- "regex-syntax 0.8.5",
320- "sha3",
321- "string_cache",
322- "term 1.0.1",
323- "unicode-xid",
324- "walkdir",
325-]
326-
327 [[package]]
328 name = "lalrpop-util"
329 version = "0.20.2"
330@@ -2223,16 +2192,6 @@ dependencies = [
331  "regex-automata 0.4.9",
332 ]
333 
334-[[package]]
335-name = "lalrpop-util"
336-version = "0.22.1"
337-source = "registry+https://github.com/rust-lang/crates.io-index"
338-checksum = "e8d05b3fe34b8bd562c338db725dfa9beb9451a48f65f129ccb9538b48d2c93b"
339-dependencies = [
340- "regex-automata 0.4.9",
341- "rustversion",
342-]
343-
344 [[package]]
345 name = "lazy_static"
346 version = "1.5.0"
347@@ -2550,7 +2509,7 @@ dependencies = [
348  "num-integer",
349  "num-iter",
350  "num-traits",
351- "rand",
352+ "rand 0.8.5",
353  "smallvec",
354  "zeroize",
355 ]
356@@ -2747,7 +2706,7 @@ dependencies = [
357  "ecdsa",
358  "elliptic-curve",
359  "primeorder",
360- "rand_core",
361+ "rand_core 0.6.4",
362  "sha2",
363 ]
364 
365@@ -2781,7 +2740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
366 checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
367 dependencies = [
368  "base64ct",
369- "rand_core",
370+ "rand_core 0.6.4",
371  "subtle",
372 ]
373 
374@@ -2857,17 +2816,7 @@ version = "0.6.5"
375 source = "registry+https://github.com/rust-lang/crates.io-index"
376 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
377 dependencies = [
378- "fixedbitset 0.4.2",
379- "indexmap",
380-]
381-
382-[[package]]
383-name = "petgraph"
384-version = "0.7.1"
385-source = "registry+https://github.com/rust-lang/crates.io-index"
386-checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
387-dependencies = [
388- "fixedbitset 0.5.7",
389+ "fixedbitset",
390  "indexmap",
391 ]
392 
393@@ -3050,6 +2999,12 @@ dependencies = [
394  "proc-macro2",
395 ]
396 
397+[[package]]
398+name = "radium"
399+version = "0.7.0"
400+source = "registry+https://github.com/rust-lang/crates.io-index"
401+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
402+
403 [[package]]
404 name = "radix_trie"
405 version = "0.2.1"
406@@ -3068,7 +3023,16 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
407 dependencies = [
408  "libc",
409  "rand_chacha",
410- "rand_core",
411+ "rand_core 0.6.4",
412+]
413+
414+[[package]]
415+name = "rand"
416+version = "0.9.4"
417+source = "registry+https://github.com/rust-lang/crates.io-index"
418+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
419+dependencies = [
420+ "rand_core 0.9.5",
421 ]
422 
423 [[package]]
424@@ -3078,7 +3042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
425 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
426 dependencies = [
427  "ppv-lite86",
428- "rand_core",
429+ "rand_core 0.6.4",
430 ]
431 
432 [[package]]
433@@ -3090,6 +3054,15 @@ dependencies = [
434  "getrandom 0.2.15",
435 ]
436 
437+[[package]]
438+name = "rand_core"
439+version = "0.9.5"
440+source = "registry+https://github.com/rust-lang/crates.io-index"
441+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
442+dependencies = [
443+ "getrandom 0.3.1",
444+]
445+
446 [[package]]
447 name = "rayon"
448 version = "1.10.0"
449@@ -3333,7 +3306,7 @@ dependencies = [
450  "num-traits",
451  "pkcs1",
452  "pkcs8",
453- "rand_core",
454+ "rand_core 0.6.4",
455  "signature",
456  "spki",
457  "subtle",
458@@ -3489,6 +3462,7 @@ dependencies = [
459  "der",
460  "generic-array",
461  "pkcs8",
462+ "serdect",
463  "subtle",
464  "zeroize",
465 ]
466@@ -3574,8 +3548,8 @@ dependencies = [
467  "anyhow",
468  "chrono",
469  "futures",
470- "lalrpop 0.22.1",
471- "lalrpop-util 0.22.1",
472+ "lalrpop",
473+ "lalrpop-util",
474  "libc",
475  "sequoia-ipc",
476  "sequoia-openpgp",
477@@ -3596,11 +3570,11 @@ dependencies = [
478  "ctor",
479  "dirs 5.0.1",
480  "fs2",
481- "lalrpop 0.20.2",
482- "lalrpop-util 0.20.2",
483+ "lalrpop",
484+ "lalrpop-util",
485  "libc",
486  "memsec",
487- "rand",
488+ "rand 0.8.5",
489  "sequoia-openpgp",
490  "socket2",
491  "tempfile",
492@@ -3722,9 +3696,9 @@ dependencies = [
493 
494 [[package]]
495 name = "sequoia-openpgp"
496-version = "2.0.0"
497+version = "2.3.0"
498 source = "registry+https://github.com/rust-lang/crates.io-index"
499-checksum = "015e5fc3d023418b9db98ca9a7f3e90b305872eeafe5ca45c5c32b5eb335c1e8"
500+checksum = "c847f0f148cf238c3aec88d092fd3c4301c21e906829ea9e415ea7531f7ec094"
501 dependencies = [
502  "aes",
503  "aes-gcm",
504@@ -3738,9 +3712,11 @@ dependencies = [
505  "bzip2",
506  "camellia",
507  "cast5",
508+ "cbc",
509  "cfb-mode",
510  "chrono",
511  "cipher",
512+ "cx448",
513  "des",
514  "digest",
515  "dsa",
516@@ -3755,21 +3731,22 @@ dependencies = [
517  "hkdf",
518  "idea",
519  "idna",
520- "lalrpop 0.20.2",
521- "lalrpop-util 0.20.2",
522+ "lalrpop",
523+ "lalrpop-util",
524  "libc",
525  "md-5",
526  "memsec",
527  "nettle",
528  "num-bigint-dig",
529+ "num-integer",
530  "ocb3",
531  "openssl",
532  "openssl-sys",
533  "p256",
534  "p384",
535  "p521",
536- "rand",
537- "rand_core",
538+ "rand 0.9.4",
539+ "rand_core 0.6.4",
540  "regex",
541  "regex-syntax 0.8.5",
542  "ripemd",
543@@ -3784,13 +3761,14 @@ dependencies = [
544  "winapi",
545  "x25519-dalek",
546  "xxhash-rust",
547+ "zeroize",
548 ]
549 
550 [[package]]
551 name = "sequoia-policy-config"
552-version = "0.8.0"
553+version = "0.8.1"
554 source = "registry+https://github.com/rust-lang/crates.io-index"
555-checksum = "8e016b708d64857b6a97e1a331d9471b73e30ed450d247628e1a0ce236b1e597"
556+checksum = "c8c2be5e64986e3192d5714c2334fbfb9e22c8cb41d7ad4583847eb590a8cea1"
557 dependencies = [
558  "anyhow",
559  "chrono",
560@@ -3846,7 +3824,7 @@ dependencies = [
561  "termcolor",
562  "terminal_size",
563  "textwrap",
564- "thiserror 1.0.69",
565+ "thiserror 2.0.12",
566  "tokio",
567  "toml_edit",
568  "typenum",
569@@ -3921,6 +3899,16 @@ dependencies = [
570  "serde",
571 ]
572 
573+[[package]]
574+name = "serdect"
575+version = "0.2.0"
576+source = "registry+https://github.com/rust-lang/crates.io-index"
577+checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177"
578+dependencies = [
579+ "base16ct",
580+ "serde",
581+]
582+
583 [[package]]
584 name = "sha1collisiondetection"
585 version = "0.3.4"
586@@ -3981,7 +3969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
587 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
588 dependencies = [
589  "digest",
590- "rand_core",
591+ "rand_core 0.6.4",
592 ]
593 
594 [[package]]
595@@ -4214,6 +4202,12 @@ dependencies = [
596  "libc",
597 ]
598 
599+[[package]]
600+name = "tap"
601+version = "1.0.1"
602+source = "registry+https://github.com/rust-lang/crates.io-index"
603+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
604+
605 [[package]]
606 name = "tempfile"
607 version = "3.17.1"
608@@ -4240,7 +4234,7 @@ dependencies = [
609  "percent-encoding",
610  "pest",
611  "pest_derive",
612- "rand",
613+ "rand 0.8.5",
614  "regex",
615  "serde",
616  "serde_json",
617@@ -4259,16 +4253,6 @@ dependencies = [
618  "winapi",
619 ]
620 
621-[[package]]
622-name = "term"
623-version = "1.0.1"
624-source = "registry+https://github.com/rust-lang/crates.io-index"
625-checksum = "a3bb6001afcea98122260987f8b7b5da969ecad46dbf0b5453702f776b491a41"
626-dependencies = [
627- "home",
628- "windows-sys 0.52.0",
629-]
630-
631 [[package]]
632 name = "termcolor"
633 version = "1.4.1"
634@@ -4937,7 +4921,7 @@ checksum = "99abfb435a71e54ab2971d8d8c32f1a7e006cdbf527f71743b1d45b93517bb92"
635 dependencies = [
636  "cipher",
637  "doc-comment",
638- "rand_core",
639+ "rand_core 0.6.4",
640  "winapi",
641  "zeroize",
642 ]
643@@ -5215,6 +5199,15 @@ version = "0.5.5"
644 source = "registry+https://github.com/rust-lang/crates.io-index"
645 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
646 
647+[[package]]
648+name = "wyz"
649+version = "0.5.1"
650+source = "registry+https://github.com/rust-lang/crates.io-index"
651+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
652+dependencies = [
653+ "tap",
654+]
655+
656 [[package]]
657 name = "x25519-dalek"
658 version = "2.0.1"
659@@ -5222,7 +5215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
660 checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
661 dependencies = [
662  "curve25519-dalek",
663- "rand_core",
664+ "rand_core 0.6.4",
665  "zeroize",
666 ]
667