Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support load openharmony root certs by default #297

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

feat: support load openharmony root certs by default #297

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c43d269
feat: support load openharmony root certs by default
richerfu Jun 3, 2024
d7395e6
feat: update folder
richerfu Jun 4, 2024
a788cb2
feat: update folder
richerfu Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/imp/openssl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,25 @@ fn load_android_root_certs(connector: &mut SslContextBuilder) -> Result<(), Erro
Ok(())
}

#[cfg(target_env = "ohos")]
fn load_ohos_root_certs(connector: &mut SslContextBuilder) -> Result<(), Error> {
use std::fs;

if let Ok(dir) = fs::read_dir("/etc/security/certificates") {
let certs = dir
.filter_map(|r| r.ok())
.filter_map(|e| fs::read(e.path()).ok())
.filter_map(|b| X509::from_pem(&b).ok());
for cert in certs {
if let Err(err) = connector.cert_store_mut().add_cert(cert) {
debug!("load_ohos_root_certs error: {:?}", err);
}
}
}

Ok(())
}

#[derive(Debug)]
pub enum Error {
Normal(ErrorStack),
Expand Down Expand Up @@ -320,6 +339,9 @@ impl TlsConnector {
#[cfg(target_os = "android")]
load_android_root_certs(&mut connector)?;

#[cfg(target_env = "ohos")]
load_ohos_root_certs(&mut connector)?;

Ok(TlsConnector {
connector: connector.build(),
use_sni: builder.use_sni,
Expand Down