Skip to content

Commit c129ef0

Browse files
committed
chore: update deprecated openssl calls to newer variants
The openssl EcPointRef::mul call is deprecated so update the code to the newer variant to avoid deprecation warnings that trigger clippy, and bump the openssl crate to the 0.10.79 minumum that added this deprecation for compatibility. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
1 parent d7e60de commit c129ef0

12 files changed

Lines changed: 13 additions & 13 deletions

File tree

admin-tool/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition = "2018"
99
[dependencies]
1010
anyhow = "1"
1111
config = "0.13.4"
12-
openssl = "0.10.72"
12+
openssl = "0.10.79"
1313
log = "0.4"
1414
time = "0.3"
1515
clap = { version = "4.4", features = ["derive"] }

client-linuxapp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ thiserror = "1"
1919
libcryptsetup-rs = { version = "0.16.1", features = ["mutex"] }
2020
secrecy = "0.8"
2121
devicemapper = "0.34.7"
22-
openssl = "0.10.72"
22+
openssl = "0.10.79"
2323

2424
fdo-data-formats = { path = "../data-formats", version = "0.5.6" }
2525
fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.6", features = ["client"] }

data-formats/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition = "2018"
99
[dependencies]
1010
ciborium = "0.2.0"
1111
hex = "0.4"
12-
openssl = "0.10.72"
12+
openssl = "0.10.79"
1313
log = "0.4"
1414
serde = "1"
1515
serde_bytes = "0.11"

data-formats/src/types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,11 +1130,11 @@ impl KeyExchange {
11301130
let mut bnctx = BigNumContext::new()?;
11311131

11321132
let mut derived = EcPoint::new(&ec_group)?;
1133-
derived.mul(
1133+
derived.mul2(
11341134
&ec_group,
11351135
other_pub.public_key(),
11361136
our_key.private_key(),
1137-
&bnctx,
1137+
&mut bnctx,
11381138
)?;
11391139
if derived.is_infinity(&ec_group) || !derived.is_on_curve(&ec_group, &mut bnctx)? {
11401140
return Err(Error::KeyExchangeError("Invalid key derived"));

db/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fdo-data-formats = { path = "../data-formats", version = "0.5.6" }
1212

1313
[dev-dependencies]
1414
fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.2", features = ["server"] }
15-
openssl = "0.10.72"
15+
openssl = "0.10.79"
1616

1717
[features]
1818
postgres = []

http-wrapper/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pretty_env_logger = "0.5"
1616

1717
hex = "0.4"
1818

19-
openssl = "0.10.72"
19+
openssl = "0.10.79"
2020

2121
fdo-data-formats = { path = "../data-formats", version = "0.5.6" }
2222
fdo-store = { path = "../store", version = "0.5.6" }

integration-tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tempfile = "3"
2323
tera = "1"
2424
regex = "1.11.1"
2525
lazy_static = "1.4.0"
26-
openssl = "0.10.72"
26+
openssl = "0.10.79"
2727
libc = "0.2"
2828
reqwest = { version = "0.12", features = ["json"] }
2929
tokio = "1.45.1"

manufacturing-client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ anyhow = "1"
1111
clap = { version = "4.4", features = ["derive"] }
1212
hex = "0.4"
1313
log = "0.4"
14-
openssl = "0.10.72"
14+
openssl = "0.10.79"
1515
tokio = { version = "1", features = ["full"] }
1616
rand = "0.8.4"
1717
tss-esapi = { version = "7.7", features = ["generate-bindings"] }

manufacturing-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config = "0.13.4"
1212
tokio = { version = "1", features = ["full"] }
1313
thiserror= "1"
1414
serde = "1"
15-
openssl = "0.10.72"
15+
openssl = "0.10.79"
1616
warp = "0.3.6"
1717
log = "0.4"
1818
hex = "0.4"

owner-onboarding-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config = "0.13.4"
1212
tokio = { version = "1", features = ["full"] }
1313
thiserror= "1"
1414
serde = "1"
15-
openssl = "0.10.72"
15+
openssl = "0.10.79"
1616
warp = "0.3.6"
1717
serde_bytes = "0.11"
1818
serde_cbor = "0.11"

0 commit comments

Comments
 (0)