Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 32e3ca7

Browse files
committedSep 12, 2023
fix(ci): use rustls over openssl to cross build
1 parent de2958f commit 32e3ca7

File tree

3 files changed

+31
-35
lines changed

3 files changed

+31
-35
lines changed
 

‎Cargo.lock

+24-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/ash_sdk/Cargo.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,9 @@ enum-display-derive = "0.1.1"
3737
serde_json = "1.0.96"
3838
strum = { version = "0.24", features = ["derive"] }
3939
chrono = { version = "0.4.24", features = ["clock"] }
40-
openssl = "0.10.54"
40+
rustls = "0.21.7"
41+
rustls-pemfile = "1.0.3"
4142

4243
[dev-dependencies]
4344
serial_test = "2.0.0"
4445
tempfile = "3.3.0"
45-
46-
[target.aarch64-unknown-linux-gnu.dependencies]
47-
openssl = { version = "0.10.54", features = ["vendored"] }

‎crates/ash_sdk/src/avalanche/nodes.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use avalanche_types::{
88
ids::node::Id as NodeId,
99
jsonrpc::info::{GetNodeVersionResult, UptimeResult, VmVersions},
1010
};
11-
use openssl::x509::X509;
11+
use rustls_pemfile::certs;
1212
use serde::{Deserialize, Serialize};
1313
use std::net::{IpAddr, Ipv4Addr};
1414

@@ -201,11 +201,9 @@ pub fn node_id_from_cert_der(cert_bytes: &[u8]) -> Result<NodeId, AshError> {
201201

202202
/// Compute the node ID from the PEM-encoded X509 certificate string
203203
pub fn node_id_from_cert_pem(cert_str: &str) -> Result<NodeId, AshError> {
204-
let cert = X509::from_pem(cert_str.as_bytes())
205-
.map_err(|e| AvalancheNodeError::InvalidCertificate(e.to_string()))?;
206-
let cert_der = cert
207-
.to_der()
208-
.map_err(|e| AvalancheNodeError::InvalidCertificate(e.to_string()))?;
204+
let cert_der = certs(&mut cert_str.as_bytes())
205+
.map_err(|e| AvalancheNodeError::InvalidCertificate(e.to_string()))?
206+
.remove(0);
209207

210208
let node_id = node_id_from_cert_der(&cert_der)?;
211209

@@ -280,8 +278,7 @@ mod tests {
280278
#[test]
281279
fn test_node_id_from_cert_der() {
282280
let cert_pem = fs::read_to_string("tests/certs/validator01.crt").unwrap();
283-
let cert = X509::from_pem(cert_pem.as_bytes()).unwrap();
284-
let cert_der = cert.to_der().unwrap();
281+
let cert_der = certs(&mut cert_pem.as_bytes()).unwrap().remove(0);
285282

286283
let node_id = node_id_from_cert_der(&cert_der).unwrap();
287284

0 commit comments

Comments
 (0)
Please sign in to comment.