Skip to content

Commit d0871fa

Browse files
Fix verification CI (#104)
* install setuptools * move toolchain file * check cargo version * fix refinedrust version for updated cargo * update dependencies in cove tap tool to match with the new Cargo * use correct version of the cargo lock --------- Signed-off-by: Wojciech Ozga <[email protected]> Co-authored-by: Lennard Gäher <[email protected]>
1 parent 2dcd17e commit d0871fa

File tree

10 files changed

+680
-25
lines changed

10 files changed

+680
-25
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
with:
1515
submodules: 'true'
1616
- name: install build dependencies
17-
run: sudo apt -qq -y install autoconf automake autotools-dev curl python3 libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev
17+
run: sudo apt-get update -y && sudo apt-get -qq -y install autoconf automake autotools-dev curl python3 libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev
1818
- name: install OpenSBI dependencies
19-
run: sudo apt -qq -y install clang
19+
run: sudo apt-get update -y && sudo apt-get -qq -y install clang
2020
- name: install Qemu dependencies
21-
run: sudo apt -qq -y install git libglib2.0-dev libfdt-dev libpixman-1-dev zlib1g-dev ninja-build python3-venv libslirp-dev xz-utils
21+
run: sudo apt-get update -y && sudo apt-get -qq -y install git libglib2.0-dev libfdt-dev libpixman-1-dev zlib1g-dev ninja-build python3-venv libslirp-dev xz-utils
2222
- name: install Buildroot dependencies
23-
run: sudo apt -qq -y install unzip sed binutils diffutils build-essential bash patch gzip bzip2 perl tar cpio unzip rsync file bc findutils
23+
run: sudo apt-get update -y && sudo apt-get -qq -y install unzip sed binutils diffutils build-essential bash patch gzip bzip2 perl tar cpio unzip rsync file bc findutils
2424
- name: install utilities
25-
run: sudo apt install -y sshpass
25+
run: sudo apt-get update -y && sudo apt-get -qq install -y sshpass
2626
- name: install rust
2727
run: curl https://sh.rustup.rs -sSf | sh -s -- -y
2828
- name: install rust nightly
@@ -31,8 +31,6 @@ jobs:
3131
run: rustup target add riscv64gc-unknown-none-elf
3232
- name: install rust nightly
3333
run: rustup component add rustfmt
34-
- name: install cargo utils
35-
run: cargo install cargo-binutils
3634
- name: build riscv toolchain
3735
run: ACE_DIR=$(pwd)/build/ MAKEFLAGS="--silent -j4" make devtools
3836
- name: build emulator

.github/workflows/verify.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
persist-credentials: false
1616
submodules: 'true'
1717
- name: Install opam dependencies
18-
run: sudo apt update -y && sudo apt install -y pkg-config git rsync tar unzip m4 time curl ocaml build-essential bubblewrap gawk libgmp-dev python2.7 python3 python3-distutils libmpfr-dev
18+
run: sudo apt update -y && sudo apt install -y pkg-config git rsync tar unzip m4 time curl ocaml build-essential bubblewrap gawk libgmp-dev python3 python-is-python3 libmpfr-dev && python3 -m pip install setuptools
1919
- name: Install opam
2020
run: curl "https://github.com/ocaml/opam/releases/download/2.1.5/opam-2.1.5-x86_64-linux" -Lo /usr/local/bin/opam && chmod +x /usr/local/bin/opam
2121
- name: Setup opam
@@ -40,6 +40,8 @@ jobs:
4040
run: eval $(opam env) && REFINEDRUST_ROOT=$PWD/verification/refinedrust ./verification/refinedrust/scripts/setup-coq.sh
4141
- name: Install RefinedRust type system
4242
run: eval $(opam env) && REFINEDRUST_ROOT=$PWD/verification/refinedrust ./verification/refinedrust/scripts/install-typesystem.sh
43+
- name: Check cargo version
44+
run: cargo --version
4345
- name: Install RefinedRust stdlib
4446
run: eval $(opam env) && REFINEDRUST_ROOT=$PWD/verification/refinedrust ./verification/refinedrust/scripts/install-stdlib.sh
4547
- name: Generate stdlib metadata
File renamed without changes.

security-monitor/Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

security-monitor/rust-crates/riscv_cove_tap/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ description = "Library to parse the RISC-V CoVE's TEE attestation payload"
66
edition = "2021"
77

88
[dependencies]
9-
#rsa = "0.9" # to create lockboxes: encrypt symetric key using public keys of target TEEs
10-
11-
rand = {version = "0.8", optional=true}
9+
rand = {version = "0.8.5", optional=true}
1210

1311
hybrid-array = "=0.2.0-rc.9"
1412
ml-kem = {version = "=0.2.0", default-features=false, features = [] }
1513

1614
# for symmetric encryption of payload
17-
aes-gcm = {version="0.10.3", default-features = false, features=["aes", "alloc"]}
15+
aes-gcm = {version="0.10.3", default-features = false, features=["aes", "alloc", "rand_core"]}
1816

1917
# provides macros that help removing boilerplate code in rust error handling
2018
thiserror-no-std = "2.0"

0 commit comments

Comments
 (0)