fix: add rand dev-dep, install rustls CryptoProvider in TLS tests, fix iroh OsRng import
This commit is contained in:
@@ -36,4 +36,5 @@ wraith-core = { path = ".", features = ["testutil", "tls", "iroh"] }
|
||||
tempfile = "3"
|
||||
rcgen = "0.14"
|
||||
rand_core = "0.6"
|
||||
ssh-key = { version = "0.6", features = ["ed25519", "alloc"] }
|
||||
ssh-key = { version = "0.6", features = ["ed25519", "alloc"] }
|
||||
rand = "0.10.1"
|
||||
|
||||
@@ -151,7 +151,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn iroh_transport_describe_format() {
|
||||
let node_id: NodeId = iroh::SecretKey::generate(rand::rngs::OsRng)
|
||||
let node_id: NodeId = iroh::SecretKey::generate(rand_core::OsRng)
|
||||
.public()
|
||||
.into();
|
||||
let desc = format!("iroh://{}", node_id.to_z32());
|
||||
@@ -160,7 +160,7 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn iroh_transport_connect_builds_endpoint() {
|
||||
let node_id: NodeId = iroh::SecretKey::generate(rand::rngs::OsRng)
|
||||
let node_id: NodeId = iroh::SecretKey::generate(rand_core::OsRng)
|
||||
.public()
|
||||
.into();
|
||||
let transport = IrohTransport::new(node_id, None, None).await.unwrap();
|
||||
|
||||
@@ -222,8 +222,13 @@ impl ServerCertVerifier for NoVerifier {
|
||||
mod tests {
|
||||
use super::*;
|
||||
use rcgen::{CertificateParams, KeyPair};
|
||||
use rustls::crypto::aws_lc_rs::default_provider;
|
||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||
|
||||
fn ensure_crypto_provider() {
|
||||
let _ = default_provider().install_default();
|
||||
}
|
||||
|
||||
fn generate_self_signed_cert() -> (CertificateDer<'static>, PrivateKeyDer<'static>) {
|
||||
let params = CertificateParams::new(vec!["localhost".to_string()]).unwrap();
|
||||
let key_pair = KeyPair::generate().unwrap();
|
||||
@@ -259,6 +264,7 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn tls_connect_insecure_self_signed() {
|
||||
ensure_crypto_provider();
|
||||
let (cert_der, key_der) = generate_self_signed_cert();
|
||||
|
||||
let acceptor = TlsAcceptor::bind(
|
||||
@@ -299,6 +305,7 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn tls_acceptor_returns_server_name() {
|
||||
ensure_crypto_provider();
|
||||
let (cert_der, key_der) = generate_self_signed_cert();
|
||||
|
||||
let acceptor = TlsAcceptor::bind(
|
||||
@@ -329,6 +336,7 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn tls_full_client_to_server_connection() {
|
||||
ensure_crypto_provider();
|
||||
let (cert_der, key_der) = generate_self_signed_cert();
|
||||
|
||||
let acceptor = TlsAcceptor::bind(
|
||||
@@ -365,6 +373,7 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn tls_acceptor_bind_port_zero_assigns_ephemeral() {
|
||||
ensure_crypto_provider();
|
||||
let (cert_der, key_der) = generate_self_signed_cert();
|
||||
|
||||
let acceptor = TlsAcceptor::bind(
|
||||
|
||||
Reference in New Issue
Block a user