From 949192b62090018454cd39121b5a35c9fa6e3840 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sat, 17 Apr 2021 15:52:08 -0500 Subject: [PATCH] Use pure Rust AES implementation --- Cargo.lock | 138 +++++++++++++++++++++++-------------------- Cargo.toml | 3 +- src/bc/xml_crypto.rs | 14 +++-- 3 files changed, 86 insertions(+), 69 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca6db0f..c2233f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,36 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher", +] + +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher", + "opaque-debug", +] + [[package]] name = "aho-corasick" version = "0.7.13" @@ -66,10 +97,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" [[package]] -name = "cc" -version = "1.0.67" +name = "cfb-mode" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "1d6975e91054798d325f85f50115056d7deccf6817fe7f947c438ee45b119632" +dependencies = [ + "cipher", +] [[package]] name = "cfg-if" @@ -78,10 +112,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] -name = "cfg-if" -version = "1.0.0" +name = "cipher" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] [[package]] name = "clap" @@ -110,7 +147,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -124,7 +161,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "crossbeam-utils", ] @@ -146,7 +183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if 0.1.10", + "cfg-if", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -160,7 +197,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "crossbeam-utils", "maybe-uninit", ] @@ -172,7 +209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if 0.1.10", + "cfg-if", "lazy_static", ] @@ -215,21 +252,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "futures" version = "0.3.5" @@ -325,6 +347,16 @@ dependencies = [ "slab", ] +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "gio" version = "0.9.0" @@ -421,7 +453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce4ce1ba28d3293b8cb8c3d33f50e6da2e5cfeefa59a0d10d922ab8015791609" dependencies = [ "bitflags", - "cfg-if 0.1.10", + "cfg-if", "futures-channel", "futures-core", "futures-util", @@ -741,7 +773,7 @@ checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" dependencies = [ "arrayvec", "bitflags", - "cfg-if 0.1.10", + "cfg-if", "ryu", "static_assertions", ] @@ -758,7 +790,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", ] [[package]] @@ -804,6 +836,8 @@ checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" name = "neolink" version = "0.3.0" dependencies = [ + "aes", + "cfb-mode", "cookie-factory", "crossbeam", "env_logger", @@ -820,7 +854,6 @@ dependencies = [ "log", "md5", "nom", - "openssl", "regex", "serde", "socket2", @@ -882,31 +915,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] -name = "openssl" -version = "0.10.33" +name = "opaque-debug" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-sys" -version = "0.9.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "paste" @@ -1155,7 +1167,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "libc", "redox_syscall", "winapi", @@ -1364,7 +1376,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "libc", "standback", "stdweb", @@ -1411,6 +1423,12 @@ dependencies = [ "serde", ] +[[package]] +name = "typenum" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" + [[package]] name = "unicode-bidi" version = "0.3.4" @@ -1494,12 +1512,6 @@ dependencies = [ "validator", ] -[[package]] -name = "vcpkg" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" - [[package]] name = "vec_map" version = "0.8.2" @@ -1524,7 +1536,7 @@ version = "0.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "wasm-bindgen-macro", ] diff --git a/Cargo.toml b/Cargo.toml index 9bc29ea..e7c8dac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,8 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +aes = "0.6" +cfb-mode = "0.6" cookie-factory = "0.3" crossbeam = "0.7" env_logger = "*" @@ -35,4 +37,3 @@ yaserde_derive = "0.3.16" xml-rs = "0.8" validator = "0.10" validator_derive = "0.10" -openssl = "0.10.33" diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index 66bfa1d..94cc1d4 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -1,5 +1,7 @@ use super::model::EncryptionProtocol; -use openssl::symm::*; +use aes::Aes128; +use cfb_mode::Cfb; +use cfb_mode::cipher::{NewStreamCipher, StreamCipher}; const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; const IV: &[u8] = b"0123456789abcdef"; @@ -17,8 +19,9 @@ pub fn decrypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol EncryptionProtocol::Aes(key) => { // AES decryption if let Some(aeskey) = key { - let t = Cipher::aes_128_cfb128(); - openssl::symm::decrypt(t, aeskey, Some(IV), &buf).unwrap() + let mut decrypted = buf.to_vec(); + Cfb::::new(aeskey.into(), IV.into()).decrypt(&mut decrypted); + decrypted } else { // Not yet ready to decrypt (still in login phase) // Use BCEncrypt @@ -41,8 +44,9 @@ pub fn encrypt(offset: u32, buf: &[u8], encryption_protocol: &EncryptionProtocol EncryptionProtocol::Aes(key) => { // AES encryption if let Some(aeskey) = key { - let t = Cipher::aes_128_cfb128(); - openssl::symm::encrypt(t, aeskey, Some(IV), &buf).unwrap() + let mut encrypted = buf.to_vec(); + Cfb::::new(aeskey.into(), IV.into()).encrypt(&mut encrypted); + encrypted } else { // Not yet ready to decrypt (still in login phase) // Use BCEncrypt