mirrors/stevenarella
mirrors
/
stevenarella
mirror of https://github.com/iceiix/stevenarella.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Update to rust-openssl 0.10.15 (from 0.7.8) 

Major API change, the last of the outdated dependencies
Closes https://github.com/iceiix/steven/issues/4

Note: would still like to replace the last usages of the OpenSSL crate
https://github.com/iceiix/steven/issues/2 but it is needed for CFB8
until a replacement is available (maybe https://github.com/RustCrypto/stream-ciphers/issues/4)
This commit is contained in:
ice_iix 2018-10-27 19:56:34 -07:00
parent 88563ba894
commit 9840a01262
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
protocol/src/protocol/mod.rs
View File

@ -14,9 +14,10 @@
#![allow(dead_code)] #![allow(dead_code)]
use openssl::crypto::symm; use openssl::symm;
use serde_json; use serde_json;
use reqwest; use reqwest;
use openssl;
pub mod mojang; pub mod mojang;
@ -691,6 +692,7 @@ pub enum Error {
IOError(io::Error), IOError(io::Error),
Json(serde_json::Error), Json(serde_json::Error),
Reqwest(reqwest::Error), Reqwest(reqwest::Error),
OpenSSL(openssl::error::ErrorStack),
} }
impl convert::From<io::Error> for Error { impl convert::From<io::Error> for Error {
@ -711,6 +713,12 @@ impl convert::From<reqwest::Error> for Error {
} }
} }
impl convert::From<openssl::error::ErrorStack> for Error {
fn from(e: openssl::error::ErrorStack) -> Error {
Error::OpenSSL(e)
}
}
impl ::std::error::Error for Error { impl ::std::error::Error for Error {
fn description(&self) -> &str { fn description(&self) -> &str {
match *self { match *self {
@ -719,6 +727,7 @@ impl ::std::error::Error for Error {
Error::IOError(ref e) => e.description(), Error::IOError(ref e) => e.description(),
Error::Json(ref e) => e.description(), Error::Json(ref e) => e.description(),
Error::Reqwest(ref e) => e.description(), Error::Reqwest(ref e) => e.description(),
Error::OpenSSL(ref e) => e.description(),
} }
} }
} }
@ -731,6 +740,7 @@ impl ::std::fmt::Display for Error {
Error::IOError(ref e) => e.fmt(f), Error::IOError(ref e) => e.fmt(f),
Error::Json(ref e) => e.fmt(f), Error::Json(ref e) => e.fmt(f),
Error::Reqwest(ref e) => e.fmt(f), Error::Reqwest(ref e) => e.fmt(f),
Error::OpenSSL(ref e) => e.fmt(f),
} }
} }
} }
@ -857,8 +867,10 @@ impl Conn {
} }
pub fn enable_encyption(&mut self, key: &[u8], decrypt: bool) { pub fn enable_encyption(&mut self, key: &[u8], decrypt: bool) {
let cipher = symm::Crypter::new(symm::Type::AES_128_CFB8); let cipher = symm::Crypter::new(symm::Cipher::aes_128_cfb8(),
cipher.init(if decrypt { symm::Mode::Decrypt } else { symm::Mode::Encrypt }, key, key); if decrypt { symm::Mode::Decrypt } else { symm::Mode::Encrypt },
key,
Some(key)).unwrap();
self.cipher = Option::Some(cipher); self.cipher = Option::Some(cipher);
} }
@ -967,8 +979,9 @@ impl Read for Conn {
Option::None => self.stream.read(buf), Option::None => self.stream.read(buf),
Option::Some(cipher) => { Option::Some(cipher) => {
let ret = try!(self.stream.read(buf)); let ret = try!(self.stream.read(buf));
let data = cipher.update(&buf[..ret]); let mut data = vec![0; ret + symm::Cipher::aes_128_cfb8().block_size()];
for i in 0..ret { let count = cipher.update(&buf[..ret], &mut data).unwrap();
for i in 0..count {
buf[i] = data[i]; buf[i] = data[i];
} }
Ok(ret) Ok(ret)
@ -982,8 +995,9 @@ impl Write for Conn {
match self.cipher.as_mut() { match self.cipher.as_mut() {
Option::None => self.stream.write(buf), Option::None => self.stream.write(buf),
Option::Some(cipher) => { Option::Some(cipher) => {
let data = cipher.update(buf); let mut data = vec![0; buf.len() + symm::Cipher::aes_128_cfb8().block_size()];
try!(self.stream.write_all(&data[..])); let count = cipher.update(buf, &mut data).unwrap();
try!(self.stream.write_all(&data[..count]));
Ok(buf.len()) Ok(buf.len())
} }
} }