attempt to work around the importCargoLock bugs

This commit is contained in:
Jan Winkelmann (keks)
2025-03-31 17:47:02 +02:00
parent 417df7aa7f
commit d023108d3b
2 changed files with 88 additions and 68 deletions

154
Cargo.lock generated
View File

@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 4
version = 3
[[package]]
name = "addr2line"
@@ -359,9 +359,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.31"
version = "4.5.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
dependencies = [
"clap_builder",
"clap_derive",
@@ -369,9 +369,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.31"
version = "4.5.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
dependencies = [
"anstream",
"anstyle",
@@ -381,9 +381,9 @@ dependencies = [
[[package]]
name = "clap_complete"
version = "4.5.46"
version = "4.5.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5c5508ea23c5366f77e53f5a0070e5a84e51687ec3ef9e0464c86dc8d13ce98"
checksum = "1e3040c8291884ddf39445dc033c70abc2bc44a42f0a3a00571a0f483a83f0cd"
dependencies = [
"clap",
]
@@ -408,9 +408,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
[[package]]
name = "clap_mangen"
version = "0.2.26"
version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a"
checksum = "fbae9cbfdc5d4fa8711c09bd7b83f644cb48281ac35bf97af3e47b0675864bdf"
dependencies = [
"clap",
"roff",
@@ -747,9 +747,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "either"
version = "1.14.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "embedded-io"
@@ -1005,7 +1005,18 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd2dddf00d9120e8ff07ec0411cd48f6f419782b53c109d3984b6bf94345c822"
dependencies = [
"hax-lib-macros",
"hax-lib-macros 0.1.0",
"num-bigint",
"num-traits",
]
[[package]]
name = "hax-lib"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61933dbb676f11311378720e1ee97a511813edb7044255381ba0d625cac6be7b"
dependencies = [
"hax-lib-macros 0.2.0",
"num-bigint",
"num-traits",
]
@@ -1016,7 +1027,21 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "013ec0c6e58481b11658007e794ee09be35b97ef02c92102b9a5c01afd43a82f"
dependencies = [
"hax-lib-macros-types",
"hax-lib-macros-types 0.1.0",
"paste",
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.98",
]
[[package]]
name = "hax-lib-macros"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ba3a8d32921c3f535e973f72053d20bc8c7f74028911a269748440952157807"
dependencies = [
"hax-lib-macros-types 0.2.0",
"paste",
"proc-macro-error",
"proc-macro2",
@@ -1037,6 +1062,19 @@ dependencies = [
"uuid",
]
[[package]]
name = "hax-lib-macros-types"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5a22f64cb35f8363892df6285e7edbe96885cd660d85bfd6765c95886647b77"
dependencies = [
"proc-macro2",
"quote",
"serde",
"serde_json",
"uuid",
]
[[package]]
name = "heapless"
version = "0.7.17"
@@ -1208,9 +1246,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
version = "0.2.170"
version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]]
name = "libcrux"
@@ -1227,21 +1265,21 @@ dependencies = [
[[package]]
name = "libcrux-blake2"
version = "0.0.2"
source = "git+https://github.com/cryspen/libcrux.git?rev=36d7d392e1c2#36d7d392e1c2a6f90c9f5224d360d43895c4ac8e"
version = "0.0.3-pre"
source = "git+https://github.com/cryspen/libcrux.git?rev=10ce653e9476#10ce653e94761352b657b6cecdcc0c85675813df"
dependencies = [
"libcrux-hacl-rs 0.0.2",
"libcrux-macros 0.0.2",
"libcrux-hacl-rs",
"libcrux-macros",
]
[[package]]
name = "libcrux-chacha20poly1305"
version = "0.0.2-beta.3"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04b666b490e714ff52d157da772a9a7faa3f394d619e79e64cdf1425599279ee"
checksum = "78d522fb626847390ea4b776c7eca179ecec363c6c4730b61b0c0feb797b8d92"
dependencies = [
"libcrux-hacl-rs 0.0.2-beta.3",
"libcrux-macros 0.0.2-beta.3",
"libcrux-hacl-rs",
"libcrux-macros",
"libcrux-poly1305",
]
@@ -1255,46 +1293,29 @@ dependencies = [
"libcrux-platform",
]
[[package]]
name = "libcrux-hacl-rs"
version = "0.0.2-beta.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb04660b91e0be4185c3a9dd8e2c317c478cc0616f9cba2a4d523e033f852fa1"
dependencies = [
"libcrux-macros 0.0.2-beta.3",
]
[[package]]
name = "libcrux-hacl-rs"
version = "0.0.2"
source = "git+https://github.com/cryspen/libcrux.git?rev=36d7d392e1c2#36d7d392e1c2a6f90c9f5224d360d43895c4ac8e"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8bba0885296a72555a5d77056c39cc9b04edd9ab1afa3025ef3dbd96220705c"
dependencies = [
"libcrux-macros 0.0.2",
"libcrux-macros",
]
[[package]]
name = "libcrux-intrinsics"
version = "0.0.2-beta.3"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5256e25c0b16c98b715f7cc6b3ed268723a1158f78a236b1625ffe4a941cab41"
checksum = "f4f764ef781467a75b92f4df575911f1cdcf77a7beb316d8054a233fed53a7ab"
dependencies = [
"hax-lib",
]
[[package]]
name = "libcrux-macros"
version = "0.0.2-beta.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5848af0bd1aca5be28708945867adb2b841824a0a6f48779407a41287d5ca231"
dependencies = [
"quote",
"syn 2.0.98",
"hax-lib 0.2.0",
]
[[package]]
name = "libcrux-macros"
version = "0.0.2"
source = "git+https://github.com/cryspen/libcrux.git?rev=36d7d392e1c2#36d7d392e1c2a6f90c9f5224d360d43895c4ac8e"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3021bc24fb679408d4d7175e21cf808f49816c599733ebf4a97e5bd39c3ce7c0"
dependencies = [
"quote",
"syn 2.0.98",
@@ -1306,7 +1327,7 @@ version = "0.0.2-beta.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89cbf9aad4ad38d53cfdd7ffe9041cc4cf516c8c5a6f9c1a7bb8136a82b7b6d6"
dependencies = [
"hax-lib",
"hax-lib 0.1.0",
"libcrux-intrinsics",
"libcrux-platform",
"libcrux-sha3",
@@ -1324,12 +1345,12 @@ dependencies = [
[[package]]
name = "libcrux-poly1305"
version = "0.0.2-beta.3"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82169ddf387e1912ebcde17979607e6a380dc758631757e7969652debe4dde9b"
checksum = "80143d78ae14ab51ceb2c8a9514fb60af6645d42a9c951bc511792c19c974fca"
dependencies = [
"libcrux-hacl-rs 0.0.2-beta.3",
"libcrux-macros 0.0.2-beta.3",
"libcrux-hacl-rs",
"libcrux-macros",
]
[[package]]
@@ -1338,7 +1359,7 @@ version = "0.0.2-beta.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6afd802f5c7862be77f1f320df6c0fea0f09a78ca94e79df26625c60d2d96de7"
dependencies = [
"hax-lib",
"hax-lib 0.1.0",
"libcrux-intrinsics",
"libcrux-platform",
]
@@ -1881,8 +1902,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.2",
"zerocopy 0.8.20",
"rand_core 0.9.3",
"zerocopy 0.8.24",
]
[[package]]
@@ -1902,7 +1923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
"rand_core 0.9.2",
"rand_core 0.9.3",
]
[[package]]
@@ -1916,12 +1937,11 @@ dependencies = [
[[package]]
name = "rand_core"
version = "0.9.2"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a509b1a2ffbe92afab0e55c8fd99dea1c280e8171bd2d88682bb20bc41cbc2c"
checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
dependencies = [
"getrandom 0.3.1",
"zerocopy 0.8.20",
]
[[package]]
@@ -2690,9 +2710,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
version = "1.15.1"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587"
checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1"
dependencies = [
"getrandom 0.3.1",
]
@@ -3173,11 +3193,11 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.8.20"
version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
dependencies = [
"zerocopy-derive 0.8.20",
"zerocopy-derive 0.8.24",
]
[[package]]
@@ -3193,9 +3213,9 @@ dependencies = [
[[package]]
name = "zerocopy-derive"
version = "0.8.20"
version = "0.8.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
dependencies = [
"proc-macro2",
"quote",

View File

@@ -72,7 +72,7 @@ postcard = { version = "1.1.1", features = ["alloc"] }
libcrux = { version = "0.0.2-pre.2" }
libcrux-chacha20poly1305 = { version = "0.0.2-beta.3" }
libcrux-ml-kem = { version = "0.0.2-beta.3" }
libcrux-blake2 = { git = "https://github.com/cryspen/libcrux.git", rev = "36d7d392e1c2"}
libcrux-blake2 = { git = "https://github.com/cryspen/libcrux.git", rev = "10ce653e9476"}
hex-literal = { version = "0.4.1" }
hex = { version = "0.4.3" }
heck = { version = "0.5.0" }