more package name replaces...

Author: VendettaReborn

Cargo.lock

@@ -6,10 +6,10 @@ edition = "2021"
 [dependencies]
 base64 = { workspace = true }
 env_logger = { workspace = true }
-rustls = { path = "../rustls", features = ["aws_lc_rs", "ring", "tls12"] }
+watfaq-rustls = { path = "../rustls", features = ["aws_lc_rs", "ring", "tls12"] }
 rustls-post-quantum = { path = "../rustls-post-quantum", optional = true }
 
 [features]
 default = []
 post-quantum = ["dep:rustls-post-quantum"]
-fips = ["rustls/fips"]
+fips = ["watfaq-rustls/fips"]

bogo/Cargo.toml

@@ -10,24 +10,24 @@ use std::sync::Arc;
 use std::{env, net, process, thread, time};
 
 use base64::prelude::{Engine, BASE64_STANDARD};
-use rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
-use rustls::client::{
+use watfaq_rustls::client::danger::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier};
+use watfaq_rustls::client::{
     ClientConfig, ClientConnection, EchConfig, EchGreaseConfig, EchMode, EchStatus, Resumption,
     WebPkiServerVerifier,
 };
-use rustls::crypto::aws_lc_rs::hpke;
-use rustls::crypto::hpke::{Hpke, HpkePublicKey};
-use rustls::crypto::{aws_lc_rs, ring, CryptoProvider};
-use rustls::internal::msgs::codec::{Codec, Reader};
-use rustls::internal::msgs::handshake::EchConfigPayload;
-use rustls::internal::msgs::persist::ServerSessionValue;
-use rustls::pki_types::pem::PemObject;
-use rustls::pki_types::{CertificateDer, EchConfigListBytes, PrivateKeyDer, ServerName, UnixTime};
-use rustls::server::danger::{ClientCertVerified, ClientCertVerifier};
-use rustls::server::{
+use watfaq_rustls::crypto::aws_lc_rs::hpke;
+use watfaq_rustls::crypto::hpke::{Hpke, HpkePublicKey};
+use watfaq_rustls::crypto::{aws_lc_rs, ring, CryptoProvider};
+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::server::danger::{ClientCertVerified, ClientCertVerifier};
+use watfaq_rustls::server::{
     ClientHello, ProducesTickets, ServerConfig, ServerConnection, WebPkiClientVerifier,
 };
-use rustls::{
+use watfaq_rustls::{
     client, compress, server, sign, version, AlertDescription, CertificateCompressionAlgorithm,
     CertificateError, Connection, DigitallySignedStruct, DistinguishedName, Error, HandshakeKind,
     InvalidMessage, NamedGroup, PeerIncompatible, PeerMisbehaved, ProtocolVersion, RootCertStore,
@@ -1559,7 +1559,7 @@ pub fn main() {
             }
             #[cfg(feature = "fips")]
             "-fips-202205" if opts.selected_provider == SelectedProvider::AwsLcRsFips => {
-                opts.provider = rustls::crypto::default_fips_provider();
+                opts.provider = watfaq_rustls::crypto::default_fips_provider();
             }
             "-fips-202205" => {
                 println!("Not a FIPS build");

bogo/src/main.rs

@@ -14,7 +14,7 @@ clap = { workspace = true }
 fxhash = { workspace = true }
 itertools = { workspace = true }
 rayon = { workspace = true }
-rustls = { path = "../rustls", features = ["ring", "aws_lc_rs"] }
+watfaq-rustls = { path = "../rustls", features = ["ring", "aws_lc_rs"] }
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = { workspace = true }

ci-bench/Cargo.toml

@@ -84,27 +84,27 @@ impl ResumptionKind {
 #[derive(Clone, Debug)]
 pub struct BenchmarkParams {
     /// Which `CryptoProvider` to test
-    pub provider: rustls::crypto::CryptoProvider,
+    pub provider: watfaq_rustls::crypto::CryptoProvider,
     /// How to make a suitable [`rustls::server::ProducesTickets`].
-    pub ticketer: &'static fn() -> Arc<dyn rustls::server::ProducesTickets>,
+    pub ticketer: &'static fn() -> Arc<dyn watfaq_rustls::server::ProducesTickets>,
     /// The type of key used to sign the TLS certificate
     pub key_type: KeyType,
     /// Cipher suite
-    pub ciphersuite: rustls::SupportedCipherSuite,
+    pub ciphersuite: watfaq_rustls::SupportedCipherSuite,
     /// TLS version
-    pub version: &'static rustls::SupportedProtocolVersion,
+    pub version: &'static watfaq_rustls::SupportedProtocolVersion,
     /// A user-facing label that identifies these params
     pub label: String,
 }
 
 impl BenchmarkParams {
     /// Create a new set of benchmark params
     pub const fn new(
-        provider: rustls::crypto::CryptoProvider,
-        ticketer: &'static fn() -> Arc<dyn rustls::server::ProducesTickets>,
+        provider: watfaq_rustls::crypto::CryptoProvider,
+        ticketer: &'static fn() -> Arc<dyn watfaq_rustls::server::ProducesTickets>,
         key_type: KeyType,
-        ciphersuite: rustls::SupportedCipherSuite,
-        version: &'static rustls::SupportedProtocolVersion,
+        ciphersuite: watfaq_rustls::SupportedCipherSuite,
+        version: &'static watfaq_rustls::SupportedProtocolVersion,
         label: String,
     ) -> Self {
         Self {