Merge branch 'dev' into jonas/psq-use-optimized

cryspen · Jul 2, 2024 · 5aaa4dc · 5aaa4dc
2 parents 6a85a4b + d5d9e41
commit 5aaa4dc
Show file tree

Hide file tree

Showing 22 changed files with 239 additions and 103 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,14 +19,18 @@ members = [
 ]
 
 [workspace.package]
-version = "0.0.2-pre.2"
+version = "0.0.2-alpha.1"
 authors = ["Cryspen"]
 license = "Apache-2.0"
 homepage = "https://github.com/cryspen/libcrux"
 edition = "2021"
 repository = "https://github.com/cryspen/libcrux"
 readme = "Readme.md"
 
+[workspace.metadata.release]
+# TODO: drop dev as soon as we merged everything back to main.
+allow-branch = ["main", "dev"]
+
 [package]
 name = "libcrux"
 version.workspace = true
@@ -44,16 +48,16 @@ exclude = ["/tests", "/specs"]
 crate-type = ["staticlib", "cdylib", "lib"]
 
 [build-dependencies]
-libcrux-platform = { version = "=0.0.2-pre.2", path = "sys/platform" }
+libcrux-platform = { version = "=0.0.2-alpha.1", path = "sys/platform" }
 
 [dependencies]
-libcrux-hacl = { version = "=0.0.2-pre.2", path = "sys/hacl" }
-libcrux-platform = { version = "=0.0.2-pre.2", path = "sys/platform" }
-libcrux-hkdf = { version = "=0.0.2-pre.2", path = "libcrux-hkdf" }
-libcrux-hmac = { version = "=0.0.2-pre.2", path = "libcrux-hmac" }
-libcrux-ecdh = { version = "=0.0.2-pre.2", path = "libcrux-ecdh" }
-libcrux-ml-kem = { version = "=0.0.2-pre.2", path = "libcrux-ml-kem" }
-libcrux-kem = { version = "=0.0.2-pre.2", path = "libcrux-kem" }
+libcrux-hacl = { version = "=0.0.2-alpha.1", path = "sys/hacl" }
+libcrux-platform = { version = "=0.0.2-alpha.1", path = "sys/platform" }
+libcrux-hkdf = { version = "=0.0.2-alpha.1", path = "libcrux-hkdf" }
+libcrux-hmac = { version = "=0.0.2-alpha.1", path = "libcrux-hmac" }
+libcrux-ecdh = { version = "=0.0.2-alpha.1", path = "libcrux-ecdh" }
+libcrux-ml-kem = { version = "=0.0.2-alpha.1", path = "libcrux-ml-kem" }
+libcrux-kem = { version = "=0.0.2-alpha.1", path = "libcrux-kem" }
 rand = { version = "0.8" }
 log = { version = "0.4", optional = true }
 # WASM API
@@ -62,8 +66,8 @@ wasm-bindgen = { version = "0.2.87", optional = true }
 # When using the hax toolchain, we have more dependencies.
 # This is only required when doing proofs.
 [target.'cfg(hax)'.dependencies]
-hax-lib-macros = { version = "0.1.0-pre.1", git = "https://github.com/hacspec/hax", branch = "main" }
-hax-lib = { version = "0.1.0-pre.1", git = "https://github.com/hacspec/hax/", branch = "main" }
+hax-lib-macros = { version = "0.1.0-alpha.1", git = "https://github.com/hacspec/hax", branch = "main" }
+hax-lib = { version = "0.1.0-alpha.1", git = "https://github.com/hacspec/hax/", branch = "main" }
 
 [dev-dependencies]
 libcrux = { path = ".", features = ["rand", "tests"] }

diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -37,7 +37,7 @@ lib25519 = { path = "../sys/lib25519" }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 criterion = "0.5"
-# libcrux-pqclean = { version = "0.0.2-pre.1", path = "sys/pqclean" }
+# libcrux-pqclean = { version = "0.0.2-alpha.1", path = "sys/pqclean" }
 pqcrypto-kyber = { version = "0.8.0" }
 
 # Benchmarking "OpenSSL"
@@ -47,7 +47,7 @@ pqcrypto-kyber = { version = "0.8.0" }
 openssl = "0.10"
 
 [target.'cfg(all(not(target_os = "windows"), target_arch = "x86_64"))'.dev-dependencies]
-libjade-sys = { version = "=0.0.2-pre.2", path = "../sys/libjade" }
+libjade-sys = { version = "=0.0.2-alpha.1", path = "../sys/libjade" }
 
 [[bench]]
 name = "sha2"

diff --git a/libcrux-ecdh/Cargo.toml b/libcrux-ecdh/Cargo.toml
@@ -13,10 +13,10 @@ path = "src/ecdh.rs"
 
 [dependencies]
 rand = { version = "0.8" }
-libcrux-hacl = { version = "=0.0.2-pre.2", path = "../sys/hacl" }
+libcrux-hacl = { version = "=0.0.2-alpha.1", path = "../sys/hacl" }
 
 [dev-dependencies]
-libcrux = { version = "=0.0.2-pre.2", path = "../", features = ["rand"] }
+libcrux = { version = "=0.0.2-alpha.1", path = "../", features = ["rand"] }
 hex = { version = "0.4.3", features = ["serde"] }
 serde_json = { version = "1.0" }
 serde = { version = "1.0", features = ["derive"] }

diff --git a/libcrux-hkdf/Cargo.toml b/libcrux-hkdf/Cargo.toml
@@ -12,5 +12,5 @@ readme.workspace = true
 path = "src/hkdf.rs"
 
 [dependencies]
-libcrux-hacl = { version = "=0.0.2-pre.2", path = "../sys/hacl" }
+libcrux-hacl = { version = "=0.0.2-alpha.1", path = "../sys/hacl" }
 
diff --git a/libcrux-hmac/Cargo.toml b/libcrux-hmac/Cargo.toml
@@ -12,5 +12,5 @@ readme.workspace = true
 path = "src/hmac.rs"
 
 [dependencies]
-libcrux-hkdf = { version = "=0.0.2-pre.2", path = "../libcrux-hkdf" }
-libcrux-hacl = { version = "=0.0.2-pre.2", path = "../sys/hacl" }
+libcrux-hkdf = { version = "=0.0.2-alpha.1", path = "../libcrux-hkdf" }
+libcrux-hacl = { version = "=0.0.2-alpha.1", path = "../sys/hacl" }
diff --git a/libcrux-kem/Cargo.toml b/libcrux-kem/Cargo.toml
@@ -12,9 +12,9 @@ readme.workspace = true
 path = "src/kem.rs"
 
 [dependencies]
-libcrux-ml-kem = { version = "0.0.2-pre.2", path = "../libcrux-ml-kem" }
-libcrux-sha3 = { version = "0.0.2-pre.2", path = "../libcrux-sha3" }
-libcrux-ecdh = { version = "0.0.2-pre.2", path = "../libcrux-ecdh" }
+libcrux-ml-kem = { version = "0.0.2-alpha.1", path = "../libcrux-ml-kem" }
+libcrux-sha3 = { version = "0.0.2-alpha.1", path = "../libcrux-sha3" }
+libcrux-ecdh = { version = "0.0.2-alpha.1", path = "../libcrux-ecdh" }
 rand = { version = "0.8" }
 
 [features]
@@ -23,6 +23,6 @@ kyber = ["libcrux-ml-kem/kyber"]
 pre-verification = ["libcrux-ml-kem/pre-verification"]
 
 [dev-dependencies]
-libcrux-kem = { version = "0.0.2-pre.2", path = "./", features = ["tests"] }
-libcrux = { version = "0.0.2-pre.2", path = "../", features = ["rand"] }
+libcrux-kem = { version = "0.0.2-alpha.1", path = "./", features = ["tests"] }
+libcrux = { version = "0.0.2-alpha.1", path = "../", features = ["rand"] }
 hex = { version = "0.4.3", features = ["serde"] }