From 6dfe5e1024cf9f296362cb69f2236b342bb251b7 Mon Sep 17 00:00:00 2001 From: James Ebert Date: Wed, 18 Dec 2024 10:41:45 -0800 Subject: [PATCH] chore: add openssl vendoring feature flags Signed-off-by: James Ebert --- Cargo.lock | 10 ++++++++++ aries/aries_vcx/Cargo.toml | 1 + aries/aries_vcx_anoncreds/Cargo.toml | 1 + aries/aries_vcx_ledger/Cargo.toml | 1 + aries/misc/anoncreds_types/Cargo.toml | 1 + aries/misc/indy_ledger_response_parser/Cargo.toml | 3 +++ aries/wrappers/uniffi-aries-vcx/core/Cargo.toml | 3 +++ did_core/did_methods/did_resolver_sov/Cargo.toml | 3 +++ 8 files changed, 23 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 789b5ffa8b..b20c411c13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3595,6 +3595,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.103" @@ -3603,6 +3612,7 @@ checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/aries/aries_vcx/Cargo.toml b/aries/aries_vcx/Cargo.toml index 12d6ffb1fd..2c24cd509f 100644 --- a/aries/aries_vcx/Cargo.toml +++ b/aries/aries_vcx/Cargo.toml @@ -17,6 +17,7 @@ vdr_proxy_ledger = [ "test_utils/vdr_proxy_ledger", ] backtrace_errors = ["backtrace"] +openssl_vendored = ["aries_vcx_ledger/openssl_vendored", "aries_vcx_anoncreds/openssl_vendored", "anoncreds_types/openssl_vendored"] # Feature for allowing legacy proof verification legacy_proof = ["aries_vcx_anoncreds/legacy_proof"] diff --git a/aries/aries_vcx_anoncreds/Cargo.toml b/aries/aries_vcx_anoncreds/Cargo.toml index 4a8028f9b9..e4a9365885 100644 --- a/aries/aries_vcx_anoncreds/Cargo.toml +++ b/aries/aries_vcx_anoncreds/Cargo.toml @@ -9,6 +9,7 @@ edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] anoncreds = ["dep:anoncreds"] +openssl_vendored = ["anoncreds/vendored", "anoncreds_types/openssl_vendored"] legacy_proof = [] [dependencies] diff --git a/aries/aries_vcx_ledger/Cargo.toml b/aries/aries_vcx_ledger/Cargo.toml index 8ddca850b0..fe8a75533b 100644 --- a/aries/aries_vcx_ledger/Cargo.toml +++ b/aries/aries_vcx_ledger/Cargo.toml @@ -10,6 +10,7 @@ edition.workspace = true [features] vdr_proxy_ledger = ["dep:indy-vdr-proxy-client"] cheqd = ["dep:did_cheqd", "dep:did_resolver", "dep:url"] +openssl_vendored = ["indy-ledger-response-parser/openssl_vendored", "anoncreds_types/openssl_vendored"] [dependencies] aries_vcx_wallet = { path = "../aries_vcx_wallet" } diff --git a/aries/misc/anoncreds_types/Cargo.toml b/aries/misc/anoncreds_types/Cargo.toml index 70437c695e..2cfd1866a4 100644 --- a/aries/misc/anoncreds_types/Cargo.toml +++ b/aries/misc/anoncreds_types/Cargo.toml @@ -11,6 +11,7 @@ path = "src/lib.rs" messages = [] ledger = [] default = ["messages", "ledger"] +openssl_vendored = ["anoncreds-clsignatures/openssl_vendored"] [dependencies] anoncreds-clsignatures = "0.3.2" diff --git a/aries/misc/indy_ledger_response_parser/Cargo.toml b/aries/misc/indy_ledger_response_parser/Cargo.toml index d169a97a36..b98d79b13c 100644 --- a/aries/misc/indy_ledger_response_parser/Cargo.toml +++ b/aries/misc/indy_ledger_response_parser/Cargo.toml @@ -3,6 +3,9 @@ name = "indy-ledger-response-parser" version = "0.1.0" edition = "2021" +[features] +openssl_vendored = ["anoncreds-clsignatures/openssl_vendored"] + [dependencies] serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.96" diff --git a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml index 7732d59334..ffa80563a6 100644 --- a/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml +++ b/aries/wrappers/uniffi-aries-vcx/core/Cargo.toml @@ -15,6 +15,9 @@ path = "uniffi-bindgen.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# TODO: look at how features should be done in regards to UniFFI. +# TODO: add zmq vendoring and openssl vendoring + [dependencies] uniffi = { version = "0.23.0", features = ["cli"] } aries_vcx = { path = "../../../aries_vcx", features = [ diff --git a/did_core/did_methods/did_resolver_sov/Cargo.toml b/did_core/did_methods/did_resolver_sov/Cargo.toml index 4384056e1f..8c3616f337 100644 --- a/did_core/did_methods/did_resolver_sov/Cargo.toml +++ b/did_core/did_methods/did_resolver_sov/Cargo.toml @@ -3,6 +3,9 @@ name = "did_resolver_sov" version = "0.1.0" edition = "2021" +[features] +openssl_vendored = ["aries_vcx_ledger/openssl_vendored"] + [dependencies] did_resolver = { path = "../../did_resolver" } aries_vcx_ledger = { path = "../../../aries/aries_vcx_ledger" }