Skip to content

Commit 8f106cd

Browse files
W95PspW95Psp
authored
Merge branch 'main' into minicore-commitment-proof
2 parents 3cd4e2a + 36d7d39 commit 8f106cd

97 files changed

Lines changed: 2219 additions & 2866 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.docker/c/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ ENV HACL_HOME=$HOME/hacl-star
2525
ENV KRML_HOME=$HOME/karamel
2626
ENV EURYDICE_HOME=$HOME/eurydice
2727
ENV CHARON_HOME=$HOME/charon
28-
ENV KRML_REV=1d81d757d5d9e16dd6463ccc72324e587c707959
29-
ENV EURYDICE_REV=788c5abefac3a9c7f79abae6a30fa8558e39764c
30-
ENV CHARON_REV=a8f2211d1b95e0462a96382023b164a4116c7ca4
28+
ENV KRML_REV=bf9b89d76dd24e2ceaaca32de3535353e7b6bc01
29+
ENV EURYDICE_REV=36a5ed7dd6b61b5cd3d69a010859005912d21537
30+
ENV CHARON_REV=763350c6948d5594d3017ecb93273bc41c1a4e1d
3131
ENV PATH="${PATH}:$HOME/fstar/bin:$HOME/z3/bin"
3232

3333
# Setup & install.

‎.docker/c/ext-tools.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ echo "export CHARON_REV=$CHARON_REV" >>$HOME/.profile
3333
source $HOME/.profile
3434

3535
# Build everything
36-
cd karamel
37-
make -j
36+
cd charon
37+
make build-charon-rust -j
3838
cd -
3939

40-
cd charon
40+
cd karamel
4141
make -j
4242
cd -
4343

‎.docker/c/install.sh‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ curl https://sh.rustup.rs -sSf | bash -s -- -y
66

77
# Prepare the sources
88
opam init --bare --disable-sandboxing --shell-setup --yes
9-
opam switch create 4.14.1
9+
opam switch create 5.1.1
1010

1111
# Get F*, HACL*, Charon, Karamel, Eurydice for running proofs and extraction
12-
curl -L https://github.com/FStarLang/FStar/releases/download/v2024.12.03/fstar_2024.12.03_Linux_x86_64.tar.gz \
12+
curl -L https://github.com/FStarLang/FStar/releases/download/v2025.02.17/fstar-v2025.02.17-Linux-x86_64.tar.gz \
1313
--output Fstar.tar.gz
1414
tar --extract --file Fstar.tar.gz
1515
rm -f Fstar.tar.gz
1616

17-
curl -L https://github.com/FStarLang/binaries/raw/master/z3-tested/z3-4.8.5-x64-ubuntu-16.04.zip --output z3.zip
18-
unzip z3.zip
19-
rm -rf z3.zip
20-
mv z3-4.8.5-x64-ubuntu-16.04/ z3
17+
curl -L https://raw.githubusercontent.com/FStarLang/FStar/8080c2c10e2a15fdacea6df31f0921850294cd37/.scripts/get_fstar_z3.sh \
18+
--output get_fstar_z3.sh
19+
chmod +x get_fstar_z3.sh
20+
mkdir -p $HOME/z3/bin
21+
./get_fstar_z3.sh $HOME/z3/bin
22+
rm -rf get_fstar_z3.sh
2123

2224
curl -L https://github.com/hacl-star/hacl-star/archive/2a8b61343a1a7232611cb763b0dc3e4dff84d656.zip \
2325
--output hacl-star.zip
@@ -32,5 +34,6 @@ echo "export PATH=\"${PATH}:$HOME/fstar/bin:$HOME/z3/bin\"" >>$HOME/.profile
3234
echo "[[ ! -r /home/$USER/.opam/opam-init/init.sh ]] || source /home/$USER/.opam/opam-init/init.sh > /dev/null 2> /dev/null" >>$HOME/.profile
3335

3436
source $HOME/.profile
35-
opam install --yes ocamlfind visitors menhir ppx_deriving_yojson core_unix sedlex wasm fix process pprint zarith yaml easy_logging terminal unionFind
37+
opam install --yes ocamlfind visitors menhir ppx_deriving_yojson core_unix \
38+
sedlex wasm fix process pprint zarith yaml easy_logging terminal unionFind
3639
eval $(opam env)

‎.github/workflows/docker-c-build-test.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ jobs:
5454

5555
- name: Extract C
5656
run: |
57-
./c.sh
57+
export HOME=/home/user
58+
./c.sh --no-glue
5859
5960
- name: Upload C extraction
6061
uses: actions/upload-artifact@v4
@@ -77,6 +78,7 @@ jobs:
7778

7879
- name: Extract C (header only)
7980
run: |
81+
export HOME=/home/user
8082
./boring.sh --no-clean
8183
8284
- name: Upload header only C extraction
@@ -100,6 +102,7 @@ jobs:
100102

101103
- name: Extract C (header only)
102104
run: |
105+
export HOME=/home/user
103106
./boring.sh --no-clean
104107
105108
- name: Upload header only C extraction

‎.github/workflows/mldsa-c.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767

6868
- name: Extract C (header only)
6969
run: |
70+
export HOME=/home/user
7071
./boring.sh --no-clean
7172
7273
- name: Upload header only C extraction
@@ -117,7 +118,7 @@ jobs:
117118

118119
- name: 🔨 Build
119120
run: |
120-
cmake -B build
121+
CC=clang CXX=clang++ cmake -B build
121122
cmake --build build
122123
123124
- name: 🏃🏻‍♀️ Test

‎.github/workflows/mlkem-c.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ jobs:
7070

7171
- name: Extract C
7272
run: |
73-
./c.sh
73+
export HOME=/home/user
74+
./c.sh --no-glue
7475
7576
- name: Upload C extraction
7677
uses: actions/upload-artifact@v4
@@ -95,6 +96,7 @@ jobs:
9596

9697
- name: Extract C (header only)
9798
run: |
99+
export HOME=/home/user
98100
./boring.sh --no-clean
99101
100102
- name: Upload header only C extraction

‎.github/workflows/mlkem-s390x.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: ML-KEM - Build & Test on s390x
22

33
on:
4-
push:
54
pull_request:
65
branches: ["main", "dev"]
76
workflow_dispatch:

‎Cargo.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ members = [
3333
]
3434

3535
[workspace.package]
36-
version = "0.0.2-beta.3"
36+
version = "0.0.2"
3737
authors = ["Cryspen"]
3838
license = "Apache-2.0"
3939
homepage = "https://github.com/cryspen/libcrux"
@@ -75,20 +75,20 @@ crate-type = ["staticlib", "cdylib", "lib"]
7575
bench = false # so libtest doesn't eat the arguments for criterion
7676

7777
[build-dependencies]
78-
libcrux-platform = { version = "=0.0.2-beta.3", path = "sys/platform" }
78+
libcrux-platform = { version = "=0.0.2", path = "sys/platform" }
7979

8080
[dependencies]
81-
libcrux-traits = { version = "=0.0.2-beta.3", path = "traits" }
82-
libcrux-hacl-rs = { version = "=0.0.2-beta.3", path = "hacl-rs" }
83-
libcrux-hacl = { version = "=0.0.2-beta.3", path = "sys/hacl" }
84-
libcrux-platform = { version = "=0.0.2-beta.3", path = "sys/platform" }
85-
libcrux-hkdf = { version = "=0.0.2-beta.3", path = "libcrux-hkdf" }
86-
libcrux-hmac = { version = "=0.0.2-beta.3", path = "libcrux-hmac" }
87-
libcrux-sha2 = { version = "=0.0.2-beta.3", path = "sha2" }
88-
libcrux-ed25519 = { version = "=0.0.2-beta.3", path = "ed25519" }
89-
libcrux-ecdh = { version = "=0.0.2-beta.3", path = "libcrux-ecdh" }
90-
libcrux-ml-kem = { version = "=0.0.2-beta.3", path = "libcrux-ml-kem" }
91-
libcrux-kem = { version = "=0.0.2-beta.3", path = "libcrux-kem" }
81+
libcrux-traits = { version = "=0.0.2", path = "traits" }
82+
libcrux-hacl-rs = { version = "=0.0.2", path = "hacl-rs" }
83+
libcrux-hacl = { version = "=0.0.2", path = "sys/hacl" }
84+
libcrux-platform = { version = "=0.0.2", path = "sys/platform" }
85+
libcrux-hkdf = { version = "=0.0.2", path = "libcrux-hkdf" }
86+
libcrux-hmac = { version = "=0.0.2", path = "libcrux-hmac" }
87+
libcrux-sha2 = { version = "=0.0.2", path = "sha2" }
88+
libcrux-ed25519 = { version = "=0.0.2", path = "ed25519" }
89+
libcrux-ecdh = { version = "=0.0.2", path = "libcrux-ecdh" }
90+
libcrux-ml-kem = { version = "=0.0.2", path = "libcrux-ml-kem" }
91+
libcrux-kem = { version = "=0.0.2", path = "libcrux-kem" }
9292
rand = { version = "0.9" }
9393
log = { version = "0.4", optional = true }
9494
# WASM API

‎benchmarks/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pqcrypto-kyber = { version = "0.8.0" }
7272
openssl = "0.10"
7373

7474
[target.'cfg(all(not(target_os = "windows"), target_arch = "x86_64"))'.dev-dependencies]
75-
libjade-sys = { version = "=0.0.2-beta.3", path = "../sys/libjade" }
75+
libjade-sys = { version = "=0.0.2", path = "../sys/libjade" }
7676

7777
[lints.rust]
7878
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(crypto_lib25519)'] }

‎blake2/Cargo.toml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ edition.workspace = true
1010
repository.workspace = true
1111
readme.workspace = true
1212

13+
[features]
14+
std = []
15+
default = ["std"]
16+
1317
[dependencies]
14-
libcrux-hacl-rs = { version = "=0.0.2-beta.3", path = "../hacl-rs/" }
15-
libcrux-macros = { version = "=0.0.2-beta.3", path = "../macros" }
18+
libcrux-hacl-rs = { version = "=0.0.2", path = "../hacl-rs/" }
19+
libcrux-macros = { version = "=0.0.2", path = "../macros" }

0 commit comments

Comments
 (0)