From 9da2c90291e5031a5b3d1aa11d4d64b09935fb3f Mon Sep 17 00:00:00 2001 From: Yihau Chen Date: Mon, 22 Jul 2024 20:13:07 +0800 Subject: [PATCH 1/2] chore: bump openssl to 0.10.66 (#2228) (cherry picked from commit 02918b89f615c70b162799e5895e4135a4addbab) # Conflicts: # Cargo.lock # programs/sbf/Cargo.lock --- Cargo.lock | 16 ++++++++++++++-- programs/sbf/Cargo.lock | 12 ++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb5e1e157830ea..59b4c181edc5fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3770,9 +3770,15 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" +<<<<<<< HEAD version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +======= +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +>>>>>>> 02918b89f6 (chore: bump openssl to 0.10.66 (#2228)) dependencies = [ "bitflags 2.4.2", "cfg-if 1.0.0", @@ -3802,18 +3808,24 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "300.1.6+3.1.4" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] [[package]] name = "openssl-sys" +<<<<<<< HEAD version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +======= +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +>>>>>>> 02918b89f6 (chore: bump openssl to 0.10.66 (#2228)) dependencies = [ "cc", "libc", diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 242fd8f9efc4c2..ee29acae17ff25 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -3259,9 +3259,15 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" +<<<<<<< HEAD version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +======= +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +>>>>>>> 02918b89f6 (chore: bump openssl to 0.10.66 (#2228)) dependencies = [ "bitflags 2.4.2", "cfg-if 1.0.0", @@ -3300,9 +3306,15 @@ dependencies = [ [[package]] name = "openssl-sys" +<<<<<<< HEAD version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +======= +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +>>>>>>> 02918b89f6 (chore: bump openssl to 0.10.66 (#2228)) dependencies = [ "cc", "libc", From 180c3d91e330933fc0178d888f6ec71010c1132d Mon Sep 17 00:00:00 2001 From: yihau Date: Tue, 23 Jul 2024 01:19:09 +0800 Subject: [PATCH 2/2] fix conflict --- Cargo.lock | 12 ------------ programs/sbf/Cargo.lock | 16 ++-------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 59b4c181edc5fd..e033fb356aedac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3770,15 +3770,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -<<<<<<< HEAD -version = "0.10.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" -======= version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" ->>>>>>> 02918b89f6 (chore: bump openssl to 0.10.66 (#2228)) dependencies = [ "bitflags 2.4.2", "cfg-if 1.0.0", @@ -3817,15 +3811,9 @@ dependencies = [ [[package]] name = "openssl-sys" -<<<<<<< HEAD -version = "0.9.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" -======= version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" ->>>>>>> 02918b89f6 (chore: bump openssl to 0.10.66 (#2228)) dependencies = [ "cc", "libc", diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index ee29acae17ff25..f880b1ad329240 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -3259,15 +3259,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -<<<<<<< HEAD -version = "0.10.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" -======= version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" ->>>>>>> 02918b89f6 (chore: bump openssl to 0.10.66 (#2228)) dependencies = [ "bitflags 2.4.2", "cfg-if 1.0.0", @@ -3297,24 +3291,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.6+3.1.4" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -<<<<<<< HEAD -version = "0.9.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" -======= version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" ->>>>>>> 02918b89f6 (chore: bump openssl to 0.10.66 (#2228)) dependencies = [ "cc", "libc",