mirror of https://github.com/ctz/rustls
Clean up `unused_qualifications` lints
This commit is contained in:
parent
2590759da7
commit
5bda9c2dfe
|
@ -11,7 +11,7 @@ use serde::Deserialize;
|
|||
use rustls::crypto::{ring, CryptoProvider};
|
||||
use rustls::pki_types::{CertificateDer, CertificateRevocationListDer, PrivateKeyDer};
|
||||
use rustls::server::WebPkiClientVerifier;
|
||||
use rustls::{self, RootCertStore};
|
||||
use rustls::RootCertStore;
|
||||
|
||||
// Token for our listening socket.
|
||||
const LISTENER: mio::Token = mio::Token(0);
|
||||
|
|
|
@ -12,7 +12,7 @@ use rustls::internal::msgs::persist::ServerSessionValue;
|
|||
use rustls::server::danger::{ClientCertVerified, ClientCertVerifier};
|
||||
use rustls::server::{ClientHello, ServerConfig, ServerConnection, WebPkiClientVerifier};
|
||||
use rustls::{
|
||||
self, client, server, sign, version, AlertDescription, CertificateError, Connection,
|
||||
client, server, sign, version, AlertDescription, CertificateError, Connection,
|
||||
DigitallySignedStruct, DistinguishedName, Error, InvalidMessage, NamedGroup, PeerIncompatible,
|
||||
PeerMisbehaved, ProtocolVersion, RootCertStore, Side, SignatureAlgorithm, SignatureScheme,
|
||||
SupportedProtocolVersion,
|
||||
|
|
|
@ -325,7 +325,7 @@ struct EcdsaSigner {
|
|||
|
||||
impl Signer for EcdsaSigner {
|
||||
fn sign(&self, message: &[u8]) -> Result<Vec<u8>, Error> {
|
||||
let rng = super::ring_like::rand::SystemRandom::new();
|
||||
let rng = SystemRandom::new();
|
||||
self.key
|
||||
.sign(&rng, message)
|
||||
.map_err(|_| Error::General("signing failed".into()))
|
||||
|
|
|
@ -165,13 +165,13 @@ pub(crate) struct KeyBuilder(
|
|||
pub(crate) &'static aead::quic::Algorithm,
|
||||
);
|
||||
|
||||
impl crate::quic::Algorithm for KeyBuilder {
|
||||
impl quic::Algorithm for KeyBuilder {
|
||||
fn packet_key(&self, key: AeadKey, iv: Iv) -> Box<dyn quic::PacketKey> {
|
||||
Box::new(super::quic::PacketKey::new(key, iv, self.0))
|
||||
Box::new(PacketKey::new(key, iv, self.0))
|
||||
}
|
||||
|
||||
fn header_protection_key(&self, key: AeadKey) -> Box<dyn quic::HeaderProtectionKey> {
|
||||
Box::new(super::quic::HeaderProtectionKey::new(key, self.1))
|
||||
Box::new(HeaderProtectionKey::new(key, self.1))
|
||||
}
|
||||
|
||||
fn aead_key_len(&self) -> usize {
|
||||
|
|
|
@ -306,7 +306,7 @@ struct EcdsaSigner {
|
|||
|
||||
impl Signer for EcdsaSigner {
|
||||
fn sign(&self, message: &[u8]) -> Result<Vec<u8>, Error> {
|
||||
let rng = super::ring_like::rand::SystemRandom::new();
|
||||
let rng = SystemRandom::new();
|
||||
self.key
|
||||
.sign(&rng, message)
|
||||
.map_err(|_| Error::General("signing failed".into()))
|
||||
|
|
|
@ -407,7 +407,6 @@ impl ServerSessionValue {
|
|||
mod tests {
|
||||
use super::*;
|
||||
use crate::enums::*;
|
||||
use crate::msgs::codec::{Codec, Reader};
|
||||
|
||||
#[test]
|
||||
fn serversessionvalue_is_debug() {
|
||||
|
|
|
@ -12,7 +12,6 @@ use crate::msgs::message::Message;
|
|||
use crate::suites::ExtractedSecrets;
|
||||
use crate::vecbuf::ChunkVecBuffer;
|
||||
use crate::verify;
|
||||
#[cfg(feature = "ring")]
|
||||
use crate::versions;
|
||||
use crate::KeyLog;
|
||||
#[cfg(feature = "ring")]
|
||||
|
@ -257,7 +256,7 @@ pub struct ServerConfig {
|
|||
|
||||
/// Supported protocol versions, in no particular order.
|
||||
/// The default is all supported versions.
|
||||
pub(super) versions: crate::versions::EnabledVersions,
|
||||
pub(super) versions: versions::EnabledVersions,
|
||||
|
||||
/// How to verify client certificates.
|
||||
pub(super) verifier: Arc<dyn verify::ClientCertVerifier>,
|
||||
|
@ -422,7 +421,7 @@ impl<'a> ReadEarlyData<'a> {
|
|||
}
|
||||
}
|
||||
|
||||
impl<'a> std::io::Read for ReadEarlyData<'a> {
|
||||
impl<'a> io::Read for ReadEarlyData<'a> {
|
||||
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
||||
self.early_data.read(buf)
|
||||
}
|
||||
|
|
|
@ -44,10 +44,10 @@ mod client_hello {
|
|||
use crate::enums::SignatureScheme;
|
||||
use crate::msgs::enums::ECPointFormat;
|
||||
use crate::msgs::enums::{ClientCertificateType, Compression};
|
||||
use crate::msgs::handshake::{CertificateChain, ServerEcdhParams};
|
||||
use crate::msgs::handshake::ClientExtension;
|
||||
use crate::msgs::handshake::ServerEcdhParams;
|
||||
use crate::msgs::handshake::{CertificateRequestPayload, ClientSessionTicket, Random};
|
||||
use crate::msgs::handshake::{CertificateStatus, EcdheServerKeyExchange};
|
||||
use crate::msgs::handshake::{ClientExtension, SessionId};
|
||||
use crate::msgs::handshake::{ClientHelloPayload, ServerHelloPayload};
|
||||
use crate::msgs::handshake::{ServerExtension, ServerKeyExchangePayload};
|
||||
use crate::sign;
|
||||
|
|
|
@ -250,7 +250,6 @@ pub enum ConnectionTrafficSecrets {
|
|||
#[cfg(all(test, any(feature = "ring", feature = "aws_lc_rs")))]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::enums::CipherSuite;
|
||||
use crate::test_provider::tls13::*;
|
||||
use std::{println, vec};
|
||||
|
||||
|
|
|
@ -333,7 +333,6 @@ pub(crate) const DOWNGRADE_SENTINEL: [u8; 8] = [0x44, 0x4f, 0x57, 0x4e, 0x47, 0x
|
|||
#[cfg(all(test, any(feature = "ring", feature = "aws_lc_rs")))]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::common_state::{CommonState, Side};
|
||||
use crate::msgs::handshake::{ClientEcdhParams, ServerEcdhParams};
|
||||
use crate::test_provider::kx_group::X25519;
|
||||
|
||||
|
|
|
@ -111,7 +111,7 @@ impl ChunkVecBuffer {
|
|||
pub(crate) fn read_buf(&mut self, mut cursor: core::io::BorrowedCursor<'_>) -> io::Result<()> {
|
||||
while !self.is_empty() && cursor.capacity() > 0 {
|
||||
let chunk = self.chunks[0].as_slice();
|
||||
let used = core::cmp::min(chunk.len(), cursor.capacity());
|
||||
let used = cmp::min(chunk.len(), cursor.capacity());
|
||||
cursor.append(&chunk[..used]);
|
||||
self.consume(used);
|
||||
}
|
||||
|
|
|
@ -16,7 +16,6 @@ use crate::verify::ServerCertVerifier;
|
|||
use crate::webpki::{RootCertStore, WebPkiServerVerifier};
|
||||
|
||||
use pki_types::{CertificateDer, UnixTime};
|
||||
use webpki_roots;
|
||||
|
||||
fn duration_nanos(d: Duration) -> u64 {
|
||||
((d.as_secs() as f64) * 1e9 + (d.subsec_nanos() as f64)) as u64
|
||||
|
|
Loading…
Reference in New Issue