From 08569309771bf1262dce10f193e5ece6709d4551 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Tue, 18 Jun 2024 11:38:57 +0200 Subject: [PATCH 1/2] cleanup cargo.tomls for mlkem release --- Cargo.lock | 19 ++++++++----------- libcrux-intrinsics/Cargo.toml | 6 ------ libcrux-ml-kem/Cargo.toml | 2 +- libcrux-sha3/Cargo.toml | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3494423ea..b7533da93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -683,7 +683,7 @@ dependencies = [ [[package]] name = "hax-lib" version = "0.1.0-pre.1" -source = "git+https://github.com/hacspec/hax/?branch=main#46bb5c19fb6f6397e15d9a4ff86c556482f81802" +source = "git+https://github.com/hacspec/hax/?branch=main#6a3081c8234e5a4468704c1dc50c1bdcd4b49f96" dependencies = [ "hax-lib-macros 0.1.0-pre.1 (git+https://github.com/hacspec/hax/?branch=main)", "num-bigint", @@ -693,7 +693,7 @@ dependencies = [ [[package]] name = "hax-lib" version = "0.1.0-pre.1" -source = "git+https://github.com/hacspec/hax/#46bb5c19fb6f6397e15d9a4ff86c556482f81802" +source = "git+https://github.com/hacspec/hax/#6a3081c8234e5a4468704c1dc50c1bdcd4b49f96" dependencies = [ "hax-lib-macros 0.1.0-pre.1 (git+https://github.com/hacspec/hax/)", "num-bigint", @@ -703,7 +703,7 @@ dependencies = [ [[package]] name = "hax-lib-macros" version = "0.1.0-pre.1" -source = "git+https://github.com/hacspec/hax/?branch=main#46bb5c19fb6f6397e15d9a4ff86c556482f81802" +source = "git+https://github.com/hacspec/hax/?branch=main#6a3081c8234e5a4468704c1dc50c1bdcd4b49f96" dependencies = [ "hax-lib-macros-types 0.1.0-pre.1 (git+https://github.com/hacspec/hax/?branch=main)", "proc-macro-error", @@ -715,7 +715,7 @@ dependencies = [ [[package]] name = "hax-lib-macros" version = "0.1.0-pre.1" -source = "git+https://github.com/hacspec/hax/#46bb5c19fb6f6397e15d9a4ff86c556482f81802" +source = "git+https://github.com/hacspec/hax/#6a3081c8234e5a4468704c1dc50c1bdcd4b49f96" dependencies = [ "hax-lib-macros-types 0.1.0-pre.1 (git+https://github.com/hacspec/hax/)", "proc-macro-error", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "hax-lib-macros-types" version = "0.1.0-pre.1" -source = "git+https://github.com/hacspec/hax/?branch=main#46bb5c19fb6f6397e15d9a4ff86c556482f81802" +source = "git+https://github.com/hacspec/hax/?branch=main#6a3081c8234e5a4468704c1dc50c1bdcd4b49f96" dependencies = [ "proc-macro2", "quote", @@ -739,7 +739,7 @@ dependencies = [ [[package]] name = "hax-lib-macros-types" version = "0.1.0-pre.1" -source = "git+https://github.com/hacspec/hax/#46bb5c19fb6f6397e15d9a4ff86c556482f81802" +source = "git+https://github.com/hacspec/hax/#6a3081c8234e5a4468704c1dc50c1bdcd4b49f96" dependencies = [ "proc-macro2", "quote", @@ -987,9 +987,6 @@ dependencies = [ [[package]] name = "libcrux-intrinsics" version = "0.0.2-pre.2" -dependencies = [ - "hax-lib 0.1.0-pre.1 (git+https://github.com/hacspec/hax/)", -] [[package]] name = "libcrux-kem" @@ -1104,9 +1101,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "minimal-lexical" diff --git a/libcrux-intrinsics/Cargo.toml b/libcrux-intrinsics/Cargo.toml index 8316c3d87..ce8c19dff 100644 --- a/libcrux-intrinsics/Cargo.toml +++ b/libcrux-intrinsics/Cargo.toml @@ -9,12 +9,6 @@ repository.workspace = true readme.workspace = true [dependencies] -# libcrux-platform = { version = "0.0.2-pre.2", path = "../sys/platform" } - -# This is only required for verification. -# The hax config is set by the hax toolchain. -[target.'cfg(hax)'.dependencies] -hax-lib = { git = "https://github.com/hacspec/hax/" } [features] simd128 = [] diff --git a/libcrux-ml-kem/Cargo.toml b/libcrux-ml-kem/Cargo.toml index ecb2670ab..8f64284cc 100644 --- a/libcrux-ml-kem/Cargo.toml +++ b/libcrux-ml-kem/Cargo.toml @@ -18,7 +18,7 @@ libcrux-intrinsics = { version = "0.0.2-pre.2", path = "../libcrux-intrinsics" } # This is only required for verification. # The hax config is set by the hax toolchain. [target.'cfg(hax)'.dependencies] -hax-lib = { git = "https://github.com/hacspec/hax/" } +hax-lib = { version = "0.1.0-pre.1", git = "https://github.com/hacspec/hax/" } [features] default = ["std"] diff --git a/libcrux-sha3/Cargo.toml b/libcrux-sha3/Cargo.toml index e4bd40fad..a6ac140d9 100644 --- a/libcrux-sha3/Cargo.toml +++ b/libcrux-sha3/Cargo.toml @@ -15,7 +15,7 @@ libcrux-intrinsics = { version = "0.0.2-pre.2", path = "../libcrux-intrinsics" } # This is only required for verification. # The hax config is set by the hax toolchain. [target.'cfg(hax)'.dependencies] -hax-lib = { git = "https://github.com/hacspec/hax/" } +hax-lib = { version = "0.1.0-pre.1", git = "https://github.com/hacspec/hax/" } [features] simd128 = [] From 7d60cb5bfe811202e9d5328a2d8d71fc0ddb60f0 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Tue, 18 Jun 2024 13:49:09 +0200 Subject: [PATCH 2/2] drop more from published crates --- libcrux-intrinsics/Cargo.toml | 1 + libcrux-ml-kem/Cargo.toml | 10 +++++++++- libcrux-sha3/Cargo.toml | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libcrux-intrinsics/Cargo.toml b/libcrux-intrinsics/Cargo.toml index ce8c19dff..2c3ac3fff 100644 --- a/libcrux-intrinsics/Cargo.toml +++ b/libcrux-intrinsics/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true edition.workspace = true repository.workspace = true readme.workspace = true +exclude = ["/proofs"] [dependencies] diff --git a/libcrux-ml-kem/Cargo.toml b/libcrux-ml-kem/Cargo.toml index 8f64284cc..f0efe635d 100644 --- a/libcrux-ml-kem/Cargo.toml +++ b/libcrux-ml-kem/Cargo.toml @@ -7,7 +7,15 @@ homepage.workspace = true edition.workspace = true repository.workspace = true readme.workspace = true -exclude = ["/tests", "/implementation_notes.pdf"] +exclude = [ + "/tests", + "/implementation_notes.pdf", + "/c", + "/proofs", + "/c.sh", + "/c.yaml", + "/hax.py", +] [dependencies] rand_core = { version = "0.6" } diff --git a/libcrux-sha3/Cargo.toml b/libcrux-sha3/Cargo.toml index a6ac140d9..2fe5dacc8 100644 --- a/libcrux-sha3/Cargo.toml +++ b/libcrux-sha3/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true edition.workspace = true repository.workspace = true readme.workspace = true +exclude = ["/proofs", "/c.sh", "/c.yaml"] [dependencies] libcrux-platform = { version = "0.0.2-pre.2", path = "../sys/platform" }