From dd8e7f650aa0f36e544d27ec5d14aff3e9fb63f5 Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <tyera@solana.com>
Date: Thu, 16 Dec 2021 13:54:18 -0700
Subject: [PATCH] Revert "Revert "Build OpenSSL statically (backport #21533)
 (#21541)""

This reverts commit 8af471671037dd66cc1366c2e9ae01f843592b73.
---
 Cargo.lock                     | 18 ++++++++++++++----
 programs/bpf/Cargo.lock        | 13 ++++++-------
 programs/bpf_loader/Cargo.toml |  1 -
 storage-bigtable/Cargo.toml    |  7 ++++++-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 137df530a5..9357fc3ba1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -93,9 +93,9 @@ checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8"
 
 [[package]]
 name = "arc-swap"
-version = "1.2.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d7d63395147b81a9e570bcc6243aaf71c017bd666d4909cfef0085bdda8d73"
+checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f"
 
 [[package]]
 name = "arrayref"
@@ -1625,7 +1625,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a1d5b4e896797c19dff490f9706817b42e9b7aa4adfe844464d3bbc9aabb035"
 dependencies = [
- "arc-swap 1.2.0",
+ "arc-swap 1.5.0",
  "futures 0.3.8",
  "log 0.4.14",
  "reqwest",
@@ -2711,6 +2711,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 
+[[package]]
+name = "openssl-src"
+version = "111.16.0+1.1.1l"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.67"
@@ -2720,6 +2729,7 @@ dependencies = [
  "autocfg 1.0.0",
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -4404,7 +4414,6 @@ dependencies = [
  "log 0.4.14",
  "num-derive",
  "num-traits",
- "openssl",
  "rand 0.7.3",
  "rand_core 0.6.2",
  "rustversion",
@@ -5646,6 +5655,7 @@ dependencies = [
  "futures 0.3.8",
  "goauth",
  "log 0.4.14",
+ "openssl",
  "prost",
  "prost-types",
  "rand_core 0.6.2",
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
index 7bbce38484..24cb06ef5a 100644
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -1853,9 +1853,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.36"
+version = "0.10.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
+checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
@@ -1867,15 +1867,15 @@ dependencies = [
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.67"
+version = "0.9.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058"
+checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73"
 dependencies = [
  "autocfg",
  "cc",
@@ -2747,7 +2747,6 @@ dependencies = [
  "log",
  "num-derive 0.3.0",
  "num-traits",
- "openssl",
  "rand_core 0.6.2",
  "sha3",
  "solana-measure",
diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
index aa06cf9a98..a094d94ccb 100644
--- a/programs/bpf_loader/Cargo.toml
+++ b/programs/bpf_loader/Cargo.toml
@@ -17,7 +17,6 @@ num-derive = "0.3"
 num-traits = "0.2"
 rand_core = "0.6.2"
 libsecp256k1 = "0.5.0"
-openssl = "^0.10.36"
 sha3 = "0.9.1"
 solana-measure = { path = "../../measure", version = "=1.8.12" }
 solana-runtime = { path = "../../runtime", version = "=1.8.12" }
diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml
index 841a35d584..3425eb7f22 100644
--- a/storage-bigtable/Cargo.toml
+++ b/storage-bigtable/Cargo.toml
@@ -23,7 +23,7 @@ prost-types = "0.8.0"
 rand_core = "0.6.2"
 serde = "1.0.122"
 serde_derive = "1.0.103"
-smpl_jwt = "0.6.0"
+smpl_jwt = "0.6.1"
 solana-metrics = { path = "../metrics", version = "=1.8.12" }
 solana-sdk = { path = "../sdk", version = "=1.8.12" }
 solana-storage-proto = { path = "../storage-proto", version = "=1.8.12" }
@@ -33,6 +33,11 @@ futures = "0.3.8"
 tonic = { version = "0.5.0", features = ["tls", "transport"] }
 zstd = "0.5.1"
 
+# openssl is a dependency of the goauth and smpl_jwt crates, but explicitly
+# declare it here as well to activate the "vendored" feature that builds OpenSSL
+# statically
+openssl = { version = "0.10", features = ["vendored"] }
+
 [lib]
 crate-type = ["lib"]
 name = "solana_storage_bigtable"