Skip to content

Commit 7e1a6e1

Browse files
authored
fix: OpenSSL function incompatible with version < v3 (#48)
Signed-off-by: Jeremy HERGAULT <jeremy.hergault@worldline.com>
1 parent fa74adf commit 7e1a6e1

6 files changed

Lines changed: 14 additions & 8 deletions

File tree

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ include = [
2222
]
2323

2424
[workspace.dependencies]
25-
prosa-utils = { version = "0.3.0", path = "prosa_utils", default-features = false }
26-
prosa-macros = { version = "0.3.0", path = "prosa_macros" }
25+
prosa-utils = { version = "0.3.1", path = "prosa_utils", default-features = false }
26+
prosa-macros = { version = "0.3.1", path = "prosa_macros" }
2727
thiserror = "2"
2828
aquamarine = "0.6"
2929
bytes = "1"

cargo-prosa/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo-prosa"
3-
version = "0.2.2"
3+
version = "0.3.0"
44
authors.workspace = true
55
description = "ProSA utility to package and deliver a builded ProSA"
66
homepage.workspace = true

prosa/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "prosa"
3-
version = "0.3.0"
3+
version = "0.3.1"
44
authors.workspace = true
55
description = "ProSA core"
66
homepage.workspace = true

prosa_macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "prosa-macros"
3-
version = "0.3.0"
3+
version = "0.3.1"
44
authors.workspace = true
55
description = "ProSA macros"
66
homepage.workspace = true

prosa_utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "prosa-utils"
3-
version = "0.3.0"
3+
version = "0.3.1"
44
authors.workspace = true
55
description = "ProSA utils"
66
homepage.workspace = true

prosa_utils/src/config/ssl/openssl.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ impl SslStore<X509, X509Store> for Store {
135135
fn get_certs(&self) -> Result<HashMap<String, X509>, ConfigError> {
136136
match self {
137137
Store::System => {
138-
let store: X509Store = self.get_store()?;
138+
/*let store: X509Store = self.get_store()?;
139139
let mut certs_map = HashMap::new();
140140
for cert in store.all_certificates() {
141141
if let Some(name) = cert
@@ -148,7 +148,13 @@ impl SslStore<X509, X509Store> for Store {
148148
}
149149
}
150150
151-
Ok(certs_map)
151+
Ok(certs_map)*/
152+
153+
// TODO handle it properly with the OpenSSL version
154+
Err(ConfigError::WrongValue(
155+
"OpenSSL".to_string(),
156+
"TODO handle this version".to_string(),
157+
))
152158
}
153159
Store::File { path } => match glob::glob(path) {
154160
Ok(certs) => {

0 commit comments

Comments
 (0)