mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-04-15 18:51:48 +02:00
fa243f8118
Updated `oqs-sys` crate to version 0.8.0 to solve build errors on x86:
/home/buildozer/.cargo/registry/src/index.crates.io-1cd66030c949c28d/oqs-sys-0.7.2/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits/KeccakP-1600-opt64.c: In function 'KeccakP1600_ExtractAndAddBytesInLane':
/home/buildozer/.cargo/registry/src/index.crates.io-1cd66030c949c28d/oqs-sys-0.7.2/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits/KeccakP-1600-opt64.c:421:66: error: 'lane' may be used uninitialized [-Werror=maybe-uninitialized]
421 | output[i] = input[i] ^ ((uint8_t *)&lane)[offset + i];
| ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
/home/buildozer/.cargo/registry/src/index.crates.io-1cd66030c949c28d/oqs-sys-0.7.2/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits/KeccakP-1600-opt64.c:413:18: note: 'lane' declared here
413 | uint64_t lane = ((const uint64_t *)state)[lanePosition];
| ^~~~
cc1: all warnings being treated as errors
gmake[3]: *** [src/common/sha3/xkcp_low/CMakeFiles/xkcp_low_keccakp_1600_plain64.dir/build.make:76: src/common/sha3/xkcp_low/CMakeFiles/xkcp_low_keccakp_1600_plain64.dir/KeccakP-1600/plain-64bits/KeccakP-1600-opt64.c.o] Error 1
gmake[2]: *** [CMakeFiles/Makefile2:268: src/common/sha3/xkcp_low/CMakeFiles/xkcp_low_keccakp_1600_plain64.dir/all] Error 2
gmake[1]: *** [CMakeFiles/Makefile2:223: src/CMakeFiles/oqs.dir/rule] Error 2
gmake: *** [Makefile:169: oqs] Error 2
thread 'main' panicked at '
command did not execute successfully, got: exit status: 2
build script failed, must exit now', /home/buildozer/.cargo/registry/src/index.crates.io-1cd66030c949c28d/cmake-0.1.49/src/lib.rs:1104:5
172 lines
3.9 KiB
Diff
172 lines
3.9 KiB
Diff
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -81,24 +81,24 @@
|
|
|
|
[[package]]
|
|
name = "bindgen"
|
|
-version = "0.60.1"
|
|
+version = "0.65.1"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
|
|
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
|
|
dependencies = [
|
|
"bitflags",
|
|
"cexpr",
|
|
"clang-sys",
|
|
- "clap 3.2.23",
|
|
- "env_logger 0.9.3",
|
|
"lazy_static",
|
|
"lazycell",
|
|
"log",
|
|
"peeking_take_while",
|
|
+ "prettyplease",
|
|
"proc-macro2",
|
|
"quote",
|
|
"regex",
|
|
"rustc-hash",
|
|
"shlex",
|
|
+ "syn 2.0.33",
|
|
"which",
|
|
]
|
|
|
|
@@ -329,19 +329,6 @@
|
|
|
|
[[package]]
|
|
name = "env_logger"
|
|
-version = "0.9.3"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
|
|
-dependencies = [
|
|
- "atty",
|
|
- "humantime",
|
|
- "log",
|
|
- "regex",
|
|
- "termcolor",
|
|
-]
|
|
-
|
|
-[[package]]
|
|
-name = "env_logger"
|
|
version = "0.10.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
|
|
@@ -708,9 +695,9 @@
|
|
|
|
[[package]]
|
|
name = "oqs-sys"
|
|
-version = "0.7.2"
|
|
+version = "0.8.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "b3929aaf333acdb26bfade2acc25bdfc927a013c87616509be67e0462a3c165b"
|
|
+checksum = "7fa114149fb6e5362b9cf539de9305a6a3cf1556fbfa93b5053b4f70cf3adfb9"
|
|
dependencies = [
|
|
"bindgen",
|
|
"build-deps",
|
|
@@ -777,19 +764,29 @@
|
|
]
|
|
|
|
[[package]]
|
|
+name = "prettyplease"
|
|
+version = "0.2.15"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
|
|
+dependencies = [
|
|
+ "proc-macro2",
|
|
+ "syn 2.0.33",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
name = "proc-macro2"
|
|
-version = "1.0.51"
|
|
+version = "1.0.67"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
|
|
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
|
|
dependencies = [
|
|
"unicode-ident",
|
|
]
|
|
|
|
[[package]]
|
|
name = "quote"
|
|
-version = "1.0.23"
|
|
+version = "1.0.33"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
|
|
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
|
|
dependencies = [
|
|
"proc-macro2",
|
|
]
|
|
@@ -871,7 +868,7 @@
|
|
"base64",
|
|
"clap 3.2.23",
|
|
"criterion",
|
|
- "env_logger 0.10.0",
|
|
+ "env_logger",
|
|
"lazy_static",
|
|
"libsodium-sys-stable",
|
|
"log",
|
|
@@ -976,7 +973,7 @@
|
|
dependencies = [
|
|
"proc-macro2",
|
|
"quote",
|
|
- "syn",
|
|
+ "syn 1.0.109",
|
|
]
|
|
|
|
[[package]]
|
|
@@ -1026,6 +1023,17 @@
|
|
]
|
|
|
|
[[package]]
|
|
+name = "syn"
|
|
+version = "2.0.33"
|
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668"
|
|
+dependencies = [
|
|
+ "proc-macro2",
|
|
+ "quote",
|
|
+ "unicode-ident",
|
|
+]
|
|
+
|
|
+[[package]]
|
|
name = "tar"
|
|
version = "0.4.38"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
@@ -1083,7 +1091,7 @@
|
|
dependencies = [
|
|
"proc-macro2",
|
|
"quote",
|
|
- "syn",
|
|
+ "syn 1.0.109",
|
|
]
|
|
|
|
[[package]]
|
|
@@ -1208,7 +1216,7 @@
|
|
"once_cell",
|
|
"proc-macro2",
|
|
"quote",
|
|
- "syn",
|
|
+ "syn 1.0.109",
|
|
"wasm-bindgen-shared",
|
|
]
|
|
|
|
@@ -1230,7 +1238,7 @@
|
|
dependencies = [
|
|
"proc-macro2",
|
|
"quote",
|
|
- "syn",
|
|
+ "syn 1.0.109",
|
|
"wasm-bindgen-backend",
|
|
"wasm-bindgen-shared",
|
|
]
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -20,7 +20,7 @@
|
|
static_assertions = "1.1.0"
|
|
memoffset = "0.6.5"
|
|
libsodium-sys-stable = { version = "1.19.26", features = ["use-pkg-config"] }
|
|
-oqs-sys = { version = "0.7.1", default-features = false, features = ['classic_mceliece', 'kyber'] }
|
|
+oqs-sys = { version = "0.8.0", default-features = false, features = ['classic_mceliece', 'kyber'] }
|
|
lazy_static = "1.4.0"
|
|
thiserror = "1.0.38"
|
|
paste = "1.0.11"
|