Upgrade dependencies to latest major versions, except tokio.
This upgrade excludes tokio 0.3 because reqwest is not yet compatible with tokio 0.3; see https://github.com/seanmonstar/reqwest/issues/1060.master
parent
900f08c17c
commit
e107ab8284
File diff suppressed because it is too large
Load Diff
20
Cargo.toml
20
Cargo.toml
|
@ -28,26 +28,26 @@ compression = ["flate2"]
|
|||
encryption = ["aes", "cfb8", "rand", "rsa"]
|
||||
|
||||
[dependencies]
|
||||
async-trait = "0.1.36"
|
||||
async-trait = "0.1.42"
|
||||
clap = { version = "2.33.1", features = ["yaml"] }
|
||||
serde = { version = "1.0.114", features = ["derive"] }
|
||||
serde_json = "1.0.56"
|
||||
serde = { version = "1.0.117", features = ["derive"] }
|
||||
serde_json = "1.0.59"
|
||||
take_mut = "0.2.2"
|
||||
tokio = { version = "0.2.22", features = ["io-util", "macros", "net", "tcp", "rt-threaded"] }
|
||||
uuid = { version = "0.8", features = ["serde"] }
|
||||
uuid = { version = "0.8.1", features = ["serde"] }
|
||||
|
||||
# Dependencies required for authentication
|
||||
# Used to format Minecraft's "server id" hash.
|
||||
num-bigint = { version = "0.3.0", optional = true }
|
||||
sha-1 = { version = "0.9.1", optional = true }
|
||||
num-bigint = { version = "0.3.1", optional = true }
|
||||
sha-1 = { version = "0.9.2", optional = true }
|
||||
# Used to make the request to the Mojang servers.
|
||||
reqwest = { version = "0.10.7", optional = true }
|
||||
reqwest = { version = "0.10.9", optional = true }
|
||||
|
||||
# Dependencies required for compression
|
||||
flate2 = { version = "1.0.16", optional = true }
|
||||
flate2 = { version = "1.0.19", optional = true }
|
||||
|
||||
# Dependencies required for encryption
|
||||
aes = { version = "0.4.0", optional = true }
|
||||
cfb8 = { version = "0.4.0", optional = true }
|
||||
aes = { version = "0.6.0", optional = true }
|
||||
cfb8 = { version = "0.6.0", optional = true }
|
||||
rand = { version = "0.7.3", optional = true }
|
||||
rsa = { version = "0.3.0", optional = true }
|
||||
|
|
|
@ -193,7 +193,7 @@ impl<Rem: Remote> PacketStream<Rem, Handshake> {
|
|||
}
|
||||
|
||||
#[cfg(feature = "encryption")]
|
||||
pub type InvalidKeyNonceLength = cfb8::stream_cipher::InvalidKeyNonceLength;
|
||||
pub type InvalidKeyNonceLength = cfb8::cipher::stream::InvalidKeyNonceLength;
|
||||
#[cfg(not(feature = "encryption"))]
|
||||
pub type InvalidKeyNonceLength = !;
|
||||
|
||||
|
@ -223,7 +223,7 @@ impl<Rem: Remote> PacketStream<Rem, Login> {
|
|||
#[cfg(feature = "encryption")]
|
||||
{
|
||||
use crate::net::packet_stream::encryption::EncryptedStream;
|
||||
use cfb8::stream_cipher::NewStreamCipher;
|
||||
use cfb8::cipher::stream::NewStreamCipher;
|
||||
use cfb8::Cfb8;
|
||||
|
||||
let cipher: Cfb8<aes::Aes128> = Cfb8::new_var(shared_secret, shared_secret)?;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use crate::net::Stream;
|
||||
use aes::Aes128;
|
||||
use cfb8::stream_cipher::StreamCipher;
|
||||
use cfb8::cipher::stream::StreamCipher;
|
||||
use cfb8::Cfb8;
|
||||
use std::pin::Pin;
|
||||
use std::task::Context;
|
||||
|
|
Loading…
Reference in New Issue