From 30343d44f0260863eb300048e4c7f7bf82ab77bd Mon Sep 17 00:00:00 2001
From: David Main <51991544+StriderDM@users.noreply.github.com>
Date: Wed, 22 Sep 2021 14:27:55 +0200
Subject: [PATCH] fix: resolved feature flags for openssl vendoring (#3287)

Description
---
Include vendored openssl library when not building ffi wallet library.
Exclude vendored openssl library when building ffi wallet library as it needs to be cross compiled for mobile which is done in mobile_build.sh.

Merge https://github.com/tari-project/tari/pull/3285 first.

We had to do the same for sqlite here:
https://github.com/tari-project/tari/pull/3073

Motivation and Context
---
Current:
![Screen Shot 2021-09-06 at 6 30 17 PM](https://user-images.githubusercontent.com/51991544/132251475-cce3d7e4-7237-4c70-8f40-c92b12d0091a.png)

This PR:
![Screen Shot 2021-09-06 at 8 06 48 PM](https://user-images.githubusercontent.com/51991544/132251455-bbdfbc5c-864f-416a-953f-9f8f6504666b.png)


[mobile_build_logs.zip](https://github.com/tari-project/tari/files/7104686/mobile_build_logs.zip)

How Has This Been Tested?
---
cargo test --all --all-features
nvm use v12.22.6 && ./node_modules/.bin/cucumber-js features/WalletFFI.feature
sh  mobile_build.sh
---
 Cargo.lock                       | 2 +-
 base_layer/wallet_ffi/Cargo.toml | 2 +-
 comms/Cargo.toml                 | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9083390aa6..b570b02168 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4321,7 +4321,7 @@ dependencies = [
  "log 0.4.14",
  "multiaddr",
  "nom 5.1.2",
- "openssl",
+ "openssl-sys",
  "opentelemetry",
  "opentelemetry-jaeger",
  "pin-project 1.0.8",
diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml
index 2f03571cc9..9aacea1702 100644
--- a/base_layer/wallet_ffi/Cargo.toml
+++ b/base_layer/wallet_ffi/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.18.6"
 edition = "2018"
 
 [dependencies]
-tari_comms = { version = "^0.10", path = "../../comms", default-features = false}
+tari_comms = { version = "^0.10", path = "../../comms", features = ["c_integration"]}
 tari_comms_dht = { version = "^0.10", path = "../../comms/dht", default-features = false }
 tari_common_types = {path="../common_types"}
 tari_crypto = "0.11.1"
diff --git a/comms/Cargo.toml b/comms/Cargo.toml
index 23bede337d..6773d65775 100644
--- a/comms/Cargo.toml
+++ b/comms/Cargo.toml
@@ -30,7 +30,7 @@ lmdb-zero = "0.4.4"
 log = { version = "0.4.0", features = ["std"] }
 multiaddr = { version = "0.13.0" }
 nom = { version = "5.1.0", features = ["std"], default-features = false }
-openssl = { version = "0.10", features = ["vendored"] }
+openssl-sys = { version = "0.9.66", features = ["vendored"], optional = true }
 pin-project = "1.0.8"
 prost = "=0.8.0"
 rand = "0.8"
@@ -65,5 +65,6 @@ tempfile = "3.1.0"
 tari_common = { version = "^0.10", path = "../common", features = ["build"] }
 
 [features]
+c_integration = []
 avx2 = ["tari_crypto/avx2"]
 rpc = ["tower-make"]