Skip to content

Commit efb09a7

Browse files
committed
openssl: stop using deprecated API
1 parent 75b773f commit efb09a7

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ version = "^0.2"
3636
optional = true
3737

3838
[dependencies.openssl]
39-
version = "^0.10"
39+
version = "^0.10.46"
4040
optional = true
4141

4242
[dependencies.p12-keystore]

src/lib.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,14 @@ cfg_if! {
377377

378378
let mut builder = OpenSslConnector::builder(OpenSslMethod::tls())?;
379379
if let Some(identity) = config.identity {
380-
let identity = openssl::pkcs12::Pkcs12::from_der(identity.der)?.parse(identity.password)?;
381-
builder.set_certificate(&identity.cert)?;
382-
builder.set_private_key(&identity.pkey)?;
383-
if let Some(chain) = identity.chain.as_ref() {
380+
let identity = openssl::pkcs12::Pkcs12::from_der(identity.der)?.parse2(identity.password)?;
381+
if let Some(cert) = identity.cert.as_ref() {
382+
builder.set_certificate(cert)?;
383+
}
384+
if let Some(pkey) = identity.pkey.as_ref() {
385+
builder.set_private_key(pkey)?;
386+
}
387+
if let Some(chain) = identity.ca.as_ref() {
384388
for cert in chain.iter().rev() {
385389
builder.add_extra_chain_cert(cert.to_owned())?;
386390
}

0 commit comments

Comments
 (0)