fmt

Author: VendettaReborn

bogo/src/main.rs

@@ -10,7 +10,9 @@ use std::sync::Arc;
 use std::{env, net, process, thread, time};
 
 use base64::prelude::{Engine, BASE64_STANDARD};
-use watfaq_rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
+use watfaq_rustls::client::danger::{
+    HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier,
+};
 use watfaq_rustls::client::{
     ClientConfig, ClientConnection, EchConfig, EchGreaseConfig, EchMode, EchStatus, Resumption,
     WebPkiServerVerifier,
@@ -22,7 +24,9 @@ use watfaq_rustls::internal::msgs::codec::{Codec, Reader};
 use watfaq_rustls::internal::msgs::handshake::EchConfigPayload;
 use watfaq_rustls::internal::msgs::persist::ServerSessionValue;
 use watfaq_rustls::pki_types::pem::PemObject;
-use watfaq_rustls::pki_types::{CertificateDer, EchConfigListBytes, PrivateKeyDer, ServerName, UnixTime};
+use watfaq_rustls::pki_types::{
+    CertificateDer, EchConfigListBytes, PrivateKeyDer, ServerName, UnixTime,
+};
 use watfaq_rustls::server::danger::{ClientCertVerified, ClientCertVerifier};
 use watfaq_rustls::server::{
     ClientHello, ProducesTickets, ServerConfig, ServerConnection, WebPkiClientVerifier,

ci-bench/src/main.rs

@@ -19,12 +19,13 @@ use watfaq_rustls::client::Resumption;
 use watfaq_rustls::crypto::{aws_lc_rs, ring, CryptoProvider, GetRandomFailed, SecureRandom};
 use watfaq_rustls::pki_types::pem::PemObject;
 use watfaq_rustls::pki_types::CertificateDer;
-use watfaq_rustls::server::{NoServerSessionStorage, ServerSessionMemoryCache, WebPkiClientVerifier};
+use watfaq_rustls::server::{
+    NoServerSessionStorage, ServerSessionMemoryCache, WebPkiClientVerifier,
+};
 use watfaq_rustls::{
     CipherSuite, ClientConfig, ClientConnection, HandshakeKind, ProtocolVersion, RootCertStore,
     ServerConfig, ServerConnection,
 };
-
 use crate::benchmark::{
     get_reported_instr_count, validate_benchmarks, Benchmark, BenchmarkKind, BenchmarkParams,
     ResumptionKind,

examples/src/bin/tlsclient-mio.rs

@@ -351,7 +351,8 @@ mod danger {
             _server_name: &ServerName<'_>,
             _ocsp: &[u8],
             _now: UnixTime,
-        ) -> Result<watfaq_rustls::client::danger::ServerCertVerified, watfaq_rustls::Error> {
+        ) -> Result<watfaq_rustls::client::danger::ServerCertVerified, watfaq_rustls::Error>
+        {
             Ok(watfaq_rustls::client::danger::ServerCertVerified::assertion())
         }
 

examples/src/bin/unbuffered-async-client.rs

@@ -9,17 +9,17 @@ use std::sync::Arc;
 use async_std::io::{ReadExt, WriteExt};
 #[cfg(feature = "async-std")]
 use async_std::net::TcpStream;
+#[cfg(not(feature = "async-std"))]
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+#[cfg(not(feature = "async-std"))]
+use tokio::net::TcpStream;
 use watfaq_rustls::client::{ClientConnectionData, UnbufferedClientConnection};
 use watfaq_rustls::unbuffered::{
     AppDataRecord, ConnectionState, EncodeError, EncryptError, InsufficientSizeError,
     UnbufferedStatus, WriteTraffic,
 };
 use watfaq_rustls::version::TLS13;
 use watfaq_rustls::{ClientConfig, RootCertStore};
-#[cfg(not(feature = "async-std"))]
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
-#[cfg(not(feature = "async-std"))]
-use tokio::net::TcpStream;
 
 #[cfg_attr(not(feature = "async-std"), tokio::main(flavor = "current_thread"))]
 #[cfg_attr(feature = "async-std", async_std::main)]

openssl-tests/src/ffdhe.rs

@@ -68,7 +68,10 @@ struct ActiveFfdheKx {
 }
 
 impl ActiveKeyExchange for ActiveFfdheKx {
-    fn complete(self: Box<Self>, peer_pub_key: &[u8]) -> Result<SharedSecret, watfaq_rustls::Error> {
+    fn complete(
+        self: Box<Self>,
+        peer_pub_key: &[u8],
+    ) -> Result<SharedSecret, watfaq_rustls::Error> {
         let peer_pub = BigUint::from_bytes_be(peer_pub_key);
         let secret = peer_pub.modpow(&self.x, &self.p);
         let secret = to_bytes_be_with_len(secret, self.group.p.len());

openssl-tests/src/raw_key_openssl_interop.rs

@@ -9,7 +9,9 @@ mod client {
     use std::net::TcpStream;
     use std::sync::Arc;
 
-    use watfaq_rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
+    use watfaq_rustls::client::danger::{
+        HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier,
+    };
     use watfaq_rustls::client::AlwaysResolvesClientRawPublicKeys;
     use watfaq_rustls::crypto::{
         aws_lc_rs as provider, verify_tls13_signature_with_raw_key, WebPkiSupportedAlgorithms,
@@ -165,7 +167,9 @@ mod server {
         aws_lc_rs as provider, verify_tls13_signature_with_raw_key, WebPkiSupportedAlgorithms,
     };
     use watfaq_rustls::pki_types::pem::PemObject;
-    use watfaq_rustls::pki_types::{CertificateDer, PrivateKeyDer, SubjectPublicKeyInfoDer, UnixTime};
+    use watfaq_rustls::pki_types::{
+        CertificateDer, PrivateKeyDer, SubjectPublicKeyInfoDer, UnixTime,
+    };
     use watfaq_rustls::server::danger::{ClientCertVerified, ClientCertVerifier};
     use watfaq_rustls::server::AlwaysResolvesServerRawPublicKeys;
     use watfaq_rustls::sign::CertifiedKey;

provider-example/examples/client.rs

@@ -11,12 +11,13 @@ fn main() {
             .cloned(),
     );
 
-    let config =
-        watfaq_rustls::ClientConfig::builder_with_provider(rustls_provider_example::provider().into())
-            .with_safe_default_protocol_versions()
-            .unwrap()
-            .with_root_certificates(root_store)
-            .with_no_client_auth();
+    let config = watfaq_rustls::ClientConfig::builder_with_provider(
+        rustls_provider_example::provider().into(),
+    )
+    .with_safe_default_protocol_versions()
+    .unwrap()
+    .with_root_certificates(root_store)
+    .with_no_client_auth();
 
     let server_name = "www.rust-lang.org".try_into().unwrap();
     let mut conn = watfaq_rustls::ClientConnection::new(Arc::new(config), server_name).unwrap();

provider-example/src/hash.rs

@@ -1,7 +1,7 @@
 use alloc::boxed::Box;
 
-use watfaq_rustls::crypto::hash;
 use sha2::Digest;
+use watfaq_rustls::crypto::hash;
 
 pub struct Sha256;
 

provider-example/src/hmac.rs

@@ -1,8 +1,8 @@
 use alloc::boxed::Box;
 
 use hmac::{Hmac, Mac};
-use watfaq_rustls::crypto;
 use sha2::{Digest, Sha256};
+use watfaq_rustls::crypto;
 
 pub struct Sha256Hmac;
 

provider-example/src/kx.rs

@@ -14,9 +14,9 @@ impl crypto::ActiveKeyExchange for KeyExchange {
         self: Box<KeyExchange>,
         peer: &[u8],
     ) -> Result<crypto::SharedSecret, watfaq_rustls::Error> {
-        let peer_array: [u8; 32] = peer
-            .try_into()
-            .map_err(|_| watfaq_rustls::Error::from(watfaq_rustls::PeerMisbehaved::InvalidKeyShare))?;
+        let peer_array: [u8; 32] = peer.try_into().map_err(|_| {
+            watfaq_rustls::Error::from(watfaq_rustls::PeerMisbehaved::InvalidKeyShare)
+        })?;
         let their_pub = x25519_dalek::PublicKey::from(peer_array);
         let shared_secret = self.priv_key.diffie_hellman(&their_pub);
         Ok(crypto::SharedSecret::from(&shared_secret.as_bytes()[..]))