From f86b090c0c71fc896ed3ba37796a2493e17539c8 Mon Sep 17 00:00:00 2001 From: Thomas Yau Date: Thu, 7 Nov 2024 12:49:15 +0800 Subject: [PATCH] CVPN-1554 Remove opq-sys and cargo update --- Cargo.lock | 145 ++--------------------------------------- deny.toml | 3 - wolfssl-sys/Cargo.toml | 13 +--- 3 files changed, 6 insertions(+), 155 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bef2e90..037089c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,29 +110,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "bindgen" -version = "0.68.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", - "which", -] - [[package]] name = "bindgen" version = "0.70.1" @@ -159,15 +136,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -[[package]] -name = "build-deps" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f14468960818ce4f3e3553c32d524446687884f8e7af5d3e252331d8a87e43" -dependencies = [ - "glob", -] - [[package]] name = "build-target" version = "0.4.0" @@ -182,9 +150,9 @@ checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "cc" -version = "1.1.37" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "shlex", ] @@ -215,15 +183,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "cmake" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" -dependencies = [ - "cc", -] - [[package]] name = "colorchoice" version = "1.0.3" @@ -259,16 +218,6 @@ dependencies = [ "log", ] -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "gimli" version = "0.31.1" @@ -287,15 +236,6 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" -[[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 = "humantime" version = "2.1.0" @@ -317,18 +257,6 @@ dependencies = [ "either", ] -[[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 = "libc" version = "0.2.162" @@ -345,12 +273,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - [[package]] name = "log" version = "0.4.22" @@ -409,43 +331,12 @@ dependencies = [ "memchr", ] -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" - -[[package]] -name = "oqs-sys" -version = "0.9.1+liboqs-0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa79adc3c10f8e01d0b134c159254e5843ec3f91c0bd868e57777beb3329e17" -dependencies = [ - "bindgen 0.68.1", - "build-deps", - "cmake", - "libc", - "pkg-config", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pin-project-lite" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - [[package]] name = "prettyplease" version = "0.2.25" @@ -488,9 +379,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -515,19 +406,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustix" -version = "0.38.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - [[package]] name = "shlex" version = "1.3.0" @@ -652,18 +530,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 = "windows-sys" version = "0.52.0" @@ -765,7 +631,6 @@ name = "wolfssl-sys" version = "1.2.0" dependencies = [ "autotools", - "bindgen 0.70.1", + "bindgen", "build-target", - "oqs-sys", ] diff --git a/deny.toml b/deny.toml index b9a4e79..39104aa 100644 --- a/deny.toml +++ b/deny.toml @@ -31,9 +31,6 @@ wildcards = "allow" highlight = "all" workspace-default-features = "allow" external-default-features = "allow" -skip = [ - { name = "bindgen", version = "0.68.1" }, -] [sources] unknown-registry = "deny" diff --git a/wolfssl-sys/Cargo.toml b/wolfssl-sys/Cargo.toml index 892b323..72250bf 100644 --- a/wolfssl-sys/Cargo.toml +++ b/wolfssl-sys/Cargo.toml @@ -16,21 +16,10 @@ bindgen = "0.70" autotools = "0.2" build-target = "0.4.0" -[dependencies.oqs-sys] -version = "0.9.1" -default-features = false -features = ["kyber"] -optional = true - [features] default = [] debug = [] -postquantum = ["dep:oqs-sys"] - - -[package.metadata.cargo-all-features] -# Not an actual feature -denylist = ["oqs-sys"] +postquantum = [] [[example]] name = "connect_pq"