7b18e1445d
- Update to upstream version 41.0.3 - Use pyo3 0.19 Resolves: rhbz#2211237
53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
|
|
index 01fba147e..9dd060f8b 100644
|
|
--- a/src/rust/Cargo.toml
|
|
+++ b/src/rust/Cargo.toml
|
|
@@ -9,7 +9,7 @@ rust-version = "1.56.0"
|
|
|
|
[dependencies]
|
|
once_cell = "1"
|
|
-pyo3 = { version = "0.18", features = ["abi3-py37"] }
|
|
+pyo3 = { version = "0.19", features = ["abi3-py37"] }
|
|
asn1 = { version = "0.15.2", default-features = false }
|
|
cryptography-cffi = { path = "cryptography-cffi" }
|
|
cryptography-x509 = { path = "cryptography-x509" }
|
|
diff --git a/src/rust/cryptography-cffi/Cargo.toml b/src/rust/cryptography-cffi/Cargo.toml
|
|
index 65051c2a4..24e53991b 100644
|
|
--- a/src/rust/cryptography-cffi/Cargo.toml
|
|
+++ b/src/rust/cryptography-cffi/Cargo.toml
|
|
@@ -8,7 +8,7 @@ publish = false
|
|
rust-version = "1.56.0"
|
|
|
|
[dependencies]
|
|
-pyo3 = { version = "0.18", features = ["abi3-py37"] }
|
|
+pyo3 = { version = "0.19", features = ["abi3-py37"] }
|
|
openssl-sys = "0.9.88"
|
|
|
|
[build-dependencies]
|
|
diff --git a/src/rust/src/x509/crl.rs b/src/rust/src/x509/crl.rs
|
|
index 923015035..1380d6eb8 100644
|
|
--- a/src/rust/src/x509/crl.rs
|
|
+++ b/src/rust/src/x509/crl.rs
|
|
@@ -145,7 +145,7 @@ impl CertificateRevocationList {
|
|
revoked_certs
|
|
});
|
|
|
|
- if idx.is_instance_of::<pyo3::types::PySlice>()? {
|
|
+ if idx.is_instance_of::<pyo3::types::PySlice>() {
|
|
let indices = idx
|
|
.downcast::<pyo3::types::PySlice>()?
|
|
.indices(self.len().try_into().unwrap())?;
|
|
diff --git a/src/rust/src/x509/extensions.rs b/src/rust/src/x509/extensions.rs
|
|
index 98d1bd63b..dcf28833f 100644
|
|
--- a/src/rust/src/x509/extensions.rs
|
|
+++ b/src/rust/src/x509/extensions.rs
|
|
@@ -211,7 +211,7 @@ fn encode_certificate_policies(
|
|
let mut qualifiers = vec![];
|
|
for py_qualifier in py_policy_qualifiers.iter()? {
|
|
let py_qualifier = py_qualifier?;
|
|
- let qualifier = if py_qualifier.is_instance_of::<pyo3::types::PyString>()? {
|
|
+ let qualifier = if py_qualifier.is_instance_of::<pyo3::types::PyString>() {
|
|
let cps_uri = match asn1::IA5String::new(py_qualifier.extract()?) {
|
|
Some(s) => s,
|
|
None => {
|