Skip to content

Commit 8bb19a8

Browse files
committed
ci: remove hacspec from matrix
actions were failing due to a weird bug, e.g., see run #7831288886
1 parent f8d71cb commit 8bb19a8

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/build-and-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
strategy:
4444
fail-fast: false
4545
matrix:
46-
crypto_backend: [lakers-crypto/hacspec, lakers-crypto/psa, lakers-crypto/rustcrypto]
46+
crypto_backend: [lakers-crypto/psa, lakers-crypto/rustcrypto]
4747
ead: [ead-none, ead-authz]
4848

4949
steps:
@@ -61,7 +61,7 @@ jobs:
6161
strategy:
6262
fail-fast: false
6363
matrix:
64-
crypto_backend: [lakers-crypto/hacspec, lakers-crypto/psa, lakers-crypto/psa-baremetal, lakers-crypto/cryptocell310, lakers-crypto/rustcrypto]
64+
crypto_backend: [lakers-crypto/psa, lakers-crypto/psa-baremetal, lakers-crypto/cryptocell310, lakers-crypto/rustcrypto]
6565
ead: [ead-none, ead-authz]
6666

6767
steps:
@@ -90,7 +90,7 @@ jobs:
9090
cd lakers
9191
9292
# generate the fstar files
93-
cargo-hax -C -p lakers --no-default-features --features='lakers-crypto/hacspec, ead-none' --release \; into -i '-lakers::generate_connection_identifier_cbor -lakers::generate_connection_identifier' fstar
93+
cargo-hax -C -p lakers --no-default-features --features='lakers-crypto/rustcrypto, ead-none' --release \; into -i '-lakers::generate_connection_identifier_cbor -lakers::generate_connection_identifier' fstar
9494
cargo-hax -C -p lakers-shared \; into -i '-lakers_shared::ffi::**' fstar
9595
9696
# even if fstar generation was ok, fail if something is not implemented

Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ members = [
66
"ead/lakers-ead-authz",
77
"crypto",
88
"crypto/lakers-crypto-cc2538",
9-
"crypto/lakers-crypto-hacspec",
9+
# "crypto/lakers-crypto-hacspec",
1010
"crypto/lakers-crypto-psa",
1111
"crypto/lakers-crypto-rustcrypto",
1212
"crypto/lakers-crypto-cryptocell310-sys",
@@ -23,7 +23,7 @@ default-members = [
2323
"lib",
2424
"ead",
2525
"crypto",
26-
"crypto/lakers-crypto-hacspec",
26+
"crypto/lakers-crypto-rustcrypto",
2727
"examples/coap",
2828
]
2929

@@ -49,17 +49,17 @@ lakers-crypto = { path = "crypto/" }
4949

5050
lakers-crypto-cc2538 = { path = "crypto/lakers-crypto-cc2538/" }
5151
lakers-crypto-cryptocell310 = { path = "crypto/lakers-crypto-cryptocell310-sys/" }
52-
lakers-crypto-hacspec = { path = "crypto/lakers-crypto-hacspec/" }
52+
# lakers-crypto-hacspec = { path = "crypto/lakers-crypto-hacspec/" }
5353
lakers-crypto-psa = { path = "crypto/lakers-crypto-psa/" }
5454
lakers-crypto-rustcrypto = { package = "lakers-crypto-rustcrypto", path = "crypto/lakers-crypto-rustcrypto/", version = "^0.4.1" }
5555

5656
lakers = { package = "lakers", path = "lib/", version = "^0.4.1", default-features = false }
5757

5858
[patch.crates-io]
59-
hacspec-lib = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
60-
hacspec-p256 = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
61-
hacspec-hkdf = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
62-
hacspec-sha256 = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
63-
hacspec-aes = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
64-
hacspec-aes-ccm = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
59+
# hacspec-lib = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
60+
# hacspec-p256 = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
61+
# hacspec-hkdf = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
62+
# hacspec-sha256 = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
63+
# hacspec-aes = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
64+
# hacspec-aes-ccm = { git = "https://github.com/malishav/hacspec", branch = "aesccm" }
6565
psa-crypto = { git = "https://github.com/malishav/rust-psa-crypto", branch = "baremetal" }

crypto/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ readme.workspace = true
1212
lakers-shared = { package = "lakers-shared", path = "../shared", default-features = false }
1313

1414
# hacspec
15-
lakers-crypto-hacspec = { workspace = true, optional = true }
15+
# lakers-crypto-hacspec = { workspace = true, optional = true }
1616

1717
# cc2538 hardware accelerated
1818
lakers-crypto-cc2538 = { workspace = true, optional = true }
@@ -29,7 +29,7 @@ rand_core = { version = "0.6.4", optional = true, default-features = false }
2929

3030
[features]
3131
default = [ ]
32-
hacspec = [ "lakers-crypto-hacspec" ]
32+
# hacspec = [ "lakers-crypto-hacspec" ]
3333
cc2538 = [ "lakers-crypto-cc2538" ]
3434
psa = [ "lakers-crypto-psa" ]
3535
psa-baremetal = [ "psa", "lakers-crypto-psa/baremetal" ]

examples/coap/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
lakers = { package = "lakers", path = "../../lib", features = ["ead-authz"] }
8-
lakers-crypto = { path = "../../crypto/", features = [ "hacspec" ] }
8+
lakers-crypto = { path = "../../crypto/", features = [ "rustcrypto" ] }
99
hexlit = "0.5.3"
1010
coap = { version = "0.13" }
1111
coap-lite = { version = "0.11.3" }

0 commit comments

Comments
 (0)