Compare commits

..

No commits in common. "6fc188f0c4c8f9d676bdd5cfec86179aca88d044" and "3011a9ef6d06f1da0332d8bb4b554cfac70540c5" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View File

@ -8,7 +8,7 @@ use crate::proxy::handshake::HandshakeSuccess;
use crate::stream::{CryptoReader, CryptoWriter}; use crate::stream::{CryptoReader, CryptoWriter};
use crate::transport::proxy_protocol::ProxyProtocolV1Builder; use crate::transport::proxy_protocol::ProxyProtocolV1Builder;
use rand::rngs::StdRng; use rand::rngs::StdRng;
use rand::RngCore; use rand::Rng;
use rand::SeedableRng; use rand::SeedableRng;
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use tokio::io::{AsyncReadExt, AsyncWriteExt, duplex}; use tokio::io::{AsyncReadExt, AsyncWriteExt, duplex};

View File

@ -1,7 +1,7 @@
use super::*; use super::*;
use crate::crypto::{sha256, sha256_hmac, AesCtr}; use crate::crypto::{sha256, sha256_hmac, AesCtr};
use crate::protocol::constants::{ProtoTag, RESERVED_NONCE_BEGINNINGS, RESERVED_NONCE_FIRST_BYTES}; use crate::protocol::constants::{ProtoTag, RESERVED_NONCE_BEGINNINGS, RESERVED_NONCE_FIRST_BYTES};
use rand::{RngExt, SeedableRng}; use rand::{Rng, SeedableRng};
use rand::rngs::StdRng; use rand::rngs::StdRng;
use std::collections::HashSet; use std::collections::HashSet;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr}; use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};