pub/latls
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes clippy and fmt
Some checks failed
CI / build (push) Successful in 27s
Details
CI / no-std (push) Successful in 26s
Details
CI / clippy (push) Successful in 26s
Details
CI / test (push) Failing after 32s
Details

Browse Source
This commit is contained in:
Kris Kwiatkowski
2026-02-21 08:28:05 +00:00
parent 672d6d5aaa
commit d468a60276
21 changed files with 135 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/common/mod.rs
View File

@@ -29,7 +29,11 @@ pub struct EchoServer {
}
impl EchoServer {
pub fn new(server: TcpListener, mode: ServerMode, cfg: Arc<rustls::ServerConfig>) -> EchoServer {
pub fn new(
server: TcpListener,
mode: ServerMode,
cfg: Arc<rustls::ServerConfig>,
) -> EchoServer {
EchoServer {
server,
connections: HashMap::new(),

47
tests/integration.rs
View File

@@ -600,7 +600,8 @@ mod early_data {
let test_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");
let certs = load_certs(&test_dir.join("fixtures").join("leaf-server.pem"));
let privkey = load_private_key(&test_dir.join("fixtures").join("leaf-server-key.pem"));
let privkey =
load_private_key(&test_dir.join("fixtures").join("leaf-server-key.pem"));
let mut config = rustls::ServerConfig::builder()
.with_cipher_suites(rustls::ALL_CIPHER_SUITES)
@@ -701,7 +702,8 @@ mod client_cert {
let ca = load_certs(&test_dir.join("fixtures").join("root-ca.pem"));
let certs = load_certs(&test_dir.join("fixtures").join("leaf-server.pem"));
let privkey = load_private_key(&test_dir.join("fixtures").join("leaf-server-key.pem"));
let privkey =
load_private_key(&test_dir.join("fixtures").join("leaf-server-key.pem"));
let mut client_auth_roots = rustls::RootCertStore::empty();
for root in ca.iter() {
@@ -745,8 +747,10 @@ mod client_cert {
fn signer(
&mut self,
) -> Result<(impl signature::SignerMut<Self::Signature>, SignatureScheme), mote_tls::ProtocolError>
{
) -> Result<
(impl signature::SignerMut<Self::Signature>, SignatureScheme),
mote_tls::ProtocolError,
> {
let secret_key = SecretKey::from_sec1_der(self.priv_key)
.map_err(|_| mote_tls::ProtocolError::InvalidPrivateKey)?;
@@ -938,7 +942,9 @@ mod cert_verify {
mod native_pki {
use embedded_io_adapters::tokio_1::FromTokio;
use mote_tls::native_pki::CertVerifier;
use mote_tls::{Aes128GcmSha256, CryptoBackend, SignatureScheme, ProtocolError as ConnectError, Verifier};
use mote_tls::{
Aes128GcmSha256, CryptoBackend, ProtocolError as ConnectError, SignatureScheme, Verifier,
};
use p256::SecretKey;
use p256::ecdsa::{DerSignature, SigningKey};
use rand_core::OsRng;
@@ -971,7 +977,9 @@ mod native_pki {
Ok(&mut self.verifier)
}
fn signer(&mut self) -> Result<(impl SignerMut<Self::Signature>, SignatureScheme), ConnectError> {
fn signer(
&mut self,
) -> Result<(impl SignerMut<Self::Signature>, SignatureScheme), ConnectError> {
let key_der = self.priv_key.ok_or(ConnectError::InvalidPrivateKey)?;
let secret_key =
SecretKey::from_sec1_der(key_der).map_err(|_| ConnectError::InvalidPrivateKey)?;
@@ -1013,7 +1021,11 @@ mod native_pki {
let ca = load_certs(&test_dir.join("fixtures").join("root-ca.pem"));
let certs = load_certs(&test_dir.join("fixtures").join("chain.pem"));
let privkey = load_private_key(&test_dir.join("fixtures").join("intermediate-server-key.pem"));
let privkey = load_private_key(
&test_dir
.join("fixtures")
.join("intermediate-server-key.pem"),
);
let mut client_auth_roots = rustls::RootCertStore::empty();
for root in ca.iter() {
@@ -1135,7 +1147,10 @@ mod native_pki {
use digest::FixedOutputReset;
use embedded_io_adapters::tokio_1::FromTokio;
use mote_tls::native_pki::CertVerifier;
use mote_tls::{Aes128GcmSha256, CryptoBackend, SignatureScheme, ProtocolError as ConnectError, Verifier};
use mote_tls::{
Aes128GcmSha256, CryptoBackend, ProtocolError as ConnectError, SignatureScheme,
Verifier,
};
use rand_core::{CryptoRngCore, OsRng};
use rsa::pkcs8::DecodePrivateKey;
use rustls::server::AllowAnyAnonymousOrAuthenticatedClient;
@@ -1183,10 +1198,13 @@ mod native_pki {
Ok(&mut self.verifier)
}
fn signer(&mut self) -> Result<(impl SignerMut<Self::Signature>, SignatureScheme), ConnectError> {
fn signer(
&mut self,
) -> Result<(impl SignerMut<Self::Signature>, SignatureScheme), ConnectError>
{
let key_der = self.priv_key.ok_or(ConnectError::InvalidPrivateKey)?;
let private_key =
rsa::RsaPrivateKey::from_pkcs8_der(key_der).map_err(|_| ConnectError::InvalidPrivateKey)?;
let private_key = rsa::RsaPrivateKey::from_pkcs8_der(key_der)
.map_err(|_| ConnectError::InvalidPrivateKey)?;
let signer = RsaPssSigningKey {
rng: &mut self.rng,
key: rsa::pss::SigningKey::<Sha256>::new(private_key),
@@ -1222,11 +1240,14 @@ mod native_pki {
let versions = &[&rustls::version::TLS13];
let test_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");
let test_dir =
std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");
let ca = load_certs(&test_dir.join("fixtures").join("rsa-root-ca.pem"));
let certs = load_certs(&test_dir.join("fixtures").join("rsa-leaf-server.pem"));
let privkey = load_private_key(&test_dir.join("fixtures").join("rsa-leaf-server-key.pem"));
let privkey = load_private_key(
&test_dir.join("fixtures").join("rsa-leaf-server-key.pem"),
);
let mut client_auth_roots = rustls::RootCertStore::empty();
for root in ca.iter() {