From f824e44a92cb84449c42afa2d1049bfec17f54d3 Mon Sep 17 00:00:00 2001 From: chrysn Date: Wed, 16 Oct 2024 15:11:10 +0200 Subject: [PATCH] coapcore: Update liboscore dependency This pulls in workarounds / fixes for clang-18, which would otherwise fail to define `uint8_t` & co in its stdint.h, causing bindgen failures. See-Also: https://gitlab.com/oscore/liboscore/-/issues/61 --- Cargo.lock | 136 ++++++------------------------------ src/lib/coapcore/Cargo.toml | 4 +- 2 files changed, 23 insertions(+), 117 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d0388010..7c681f2a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,17 +123,6 @@ dependencies = [ "critical-section", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.4.0" @@ -202,24 +191,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.63.0" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cexpr", "clang-sys", - "lazy_static", - "lazycell", + "itertools", "log 0.4.22", - "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", - "which", + "syn 2.0.85", ] [[package]] @@ -333,7 +320,6 @@ version = "0.24.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" dependencies = [ - "clap", "heck 0.4.1", "indexmap 1.9.3", "log 0.4.22", @@ -443,30 +429,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "strsim 0.10.0", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "clist" version = "0.1.1" @@ -859,7 +821,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.85", ] @@ -2360,15 +2322,6 @@ dependencies = [ "riot-rs-boards", ] -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.4.0" @@ -2399,15 +2352,6 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "httparse" version = "1.9.5" @@ -2468,7 +2412,7 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi", "libc", "windows-sys 0.52.0", ] @@ -2574,18 +2518,6 @@ dependencies = [ "regex", ] -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "ld-memory" version = "0.2.9" @@ -2623,7 +2555,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "liboscore" version = "0.1.0" -source = "git+https://gitlab.com/oscore/liboscore/?rev=e7a4ecd037cbb9c7f085047fec5896f4bdc68d50#e7a4ecd037cbb9c7f085047fec5896f4bdc68d50" +source = "git+https://gitlab.com/oscore/liboscore/?rev=447e34fc5af427de7513f96a756babfe2f0b2c5c#447e34fc5af427de7513f96a756babfe2f0b2c5c" dependencies = [ "bindgen", "cbindgen", @@ -2639,7 +2571,7 @@ dependencies = [ [[package]] name = "liboscore-cryptobackend" version = "0.1.0" -source = "git+https://gitlab.com/oscore/liboscore/?rev=e7a4ecd037cbb9c7f085047fec5896f4bdc68d50#e7a4ecd037cbb9c7f085047fec5896f4bdc68d50" +source = "git+https://gitlab.com/oscore/liboscore/?rev=447e34fc5af427de7513f96a756babfe2f0b2c5c#447e34fc5af427de7513f96a756babfe2f0b2c5c" dependencies = [ "aead", "aes", @@ -2657,7 +2589,7 @@ dependencies = [ [[package]] name = "liboscore-msgbackend" version = "0.1.0" -source = "git+https://gitlab.com/oscore/liboscore/?rev=e7a4ecd037cbb9c7f085047fec5896f4bdc68d50#e7a4ecd037cbb9c7f085047fec5896f4bdc68d50" +source = "git+https://gitlab.com/oscore/liboscore/?rev=447e34fc5af427de7513f96a756babfe2f0b2c5c#447e34fc5af427de7513f96a756babfe2f0b2c5c" dependencies = [ "coap-message", "coap-message-implementations", @@ -3161,12 +3093,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "p256" version = "0.13.2" @@ -3227,12 +3153,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "petgraph" version = "0.6.5" @@ -3425,6 +3345,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" +[[package]] +name = "prettyplease" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" +dependencies = [ + "proc-macro2", + "syn 2.0.85", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -4458,12 +4388,6 @@ dependencies = [ "precomputed-hash", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -4568,12 +4492,6 @@ dependencies = [ "riot-rs-boards", ] -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - [[package]] name = "thiserror" version = "1.0.65" @@ -4884,18 +4802,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/src/lib/coapcore/Cargo.toml b/src/lib/coapcore/Cargo.toml index 939ad7e0e..1d05a6795 100644 --- a/src/lib/coapcore/Cargo.toml +++ b/src/lib/coapcore/Cargo.toml @@ -26,9 +26,9 @@ coap-message-utils = "0.3.3" coap-numbers = "0.2.3" hexlit = "0.5.5" lakers-crypto-rustcrypto = "0.6.0" -liboscore = { git = "https://gitlab.com/oscore/liboscore/", rev = "e7a4ecd037cbb9c7f085047fec5896f4bdc68d50" } +liboscore = { git = "https://gitlab.com/oscore/liboscore/", rev = "447e34fc5af427de7513f96a756babfe2f0b2c5c" } liboscore-msgbackend = { git = "https://gitlab.com/oscore/liboscore/", features = [ "alloc", -], rev = "e7a4ecd037cbb9c7f085047fec5896f4bdc68d50" } +], rev = "447e34fc5af427de7513f96a756babfe2f0b2c5c" } minicbor = "0.23.0" heapless = "0.8.0"