From 02f4cab6ba84d40fa17da81ba8fc2134f1e18913 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sat, 17 Apr 2021 12:35:55 +0700 Subject: [PATCH] Added AES encryption --- Cargo.lock | 99 +++++++++++++----- Cargo.toml | 2 +- src/bc/de.rs | 7 +- src/bc/model.rs | 48 ++++++--- .../samples/EncryptionProtocol02_login.pcapng | Bin 0 -> 13476 bytes src/bc/ser.rs | 8 +- src/bc/xml_crypto.rs | 16 ++- src/bc_protocol.rs | 11 +- src/bc_protocol/connection.rs | 12 +-- 9 files changed, 146 insertions(+), 57 deletions(-) create mode 100644 src/bc/samples/EncryptionProtocol02_login.pcapng diff --git a/Cargo.lock b/Cargo.lock index de5cfa3..ca6db0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,17 +30,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -[[package]] -name = "atomic_enum" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a57588a20357c74ee9036656b7fad5c54328ee8657c6ff29ba31fd5ea503a1c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "atty" version = "0.2.14" @@ -76,12 +65,24 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +[[package]] +name = "cc" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "clap" version = "2.33.1" @@ -109,7 +110,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -123,7 +124,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", ] @@ -145,7 +146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -159,7 +160,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "maybe-uninit", ] @@ -171,7 +172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -214,6 +215,21 @@ 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" @@ -405,7 +421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce4ce1ba28d3293b8cb8c3d33f50e6da2e5cfeefa59a0d10d922ab8015791609" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 0.1.10", "futures-channel", "futures-core", "futures-util", @@ -725,7 +741,7 @@ checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" dependencies = [ "arrayvec", "bitflags", - "cfg-if", + "cfg-if 0.1.10", "ryu", "static_assertions", ] @@ -742,7 +758,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -788,7 +804,6 @@ checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" name = "neolink" version = "0.3.0" dependencies = [ - "atomic_enum", "cookie-factory", "crossbeam", "env_logger", @@ -805,6 +820,7 @@ dependencies = [ "log", "md5", "nom", + "openssl", "regex", "serde", "socket2", @@ -861,9 +877,36 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" + +[[package]] +name = "openssl" +version = "0.10.33" +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", +] [[package]] name = "paste" @@ -1112,7 +1155,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi", @@ -1321,7 +1364,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "standback", "stdweb", @@ -1451,6 +1494,12 @@ 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" @@ -1475,7 +1524,7 @@ version = "0.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "wasm-bindgen-macro", ] diff --git a/Cargo.toml b/Cargo.toml index 6c80ef6..9bc29ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,4 +35,4 @@ yaserde_derive = "0.3.16" xml-rs = "0.8" validator = "0.10" validator_derive = "0.10" -atomic_enum = "0.1.1" +openssl = "0.10.33" diff --git a/src/bc/de.rs b/src/bc/de.rs index a6e5240..0a4c4b9 100644 --- a/src/bc/de.rs +++ b/src/bc/de.rs @@ -127,8 +127,11 @@ fn bc_modern_msg<'a, 'b>( let encryption_protocol_byte = (header.response_code & 0xff) as usize; match encryption_protocol_byte { 0x00 => context.set_encrypted(EncryptionProtocol::Unencrypted), - 0x01 => context.set_encrypted(EncryptionProtocol::VersionOne), - 0x03 => context.set_encrypted(EncryptionProtocol::VersionThree), + 0x01 => context.set_encrypted(EncryptionProtocol::BCEncrypt), + 0x03 => context.set_encrypted(EncryptionProtocol::Aes(AesKey { + nonce: None, + passwd: None, + })), _ => context.set_encrypted(EncryptionProtocol::Unknown), } } diff --git a/src/bc/model.rs b/src/bc/model.rs index 3906586..1d766e7 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -1,7 +1,6 @@ pub use super::xml::{BcPayloads, BcXml, Extension}; -use atomic_enum::atomic_enum; use std::collections::HashSet; -use std::sync::{atomic::Ordering, Arc}; +use std::sync::{Arc, Mutex}; pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; @@ -72,12 +71,32 @@ pub(super) struct BcSendInfo { pub payload_offset: Option, } -#[atomic_enum] -#[derive(PartialEq)] +#[derive(Debug, Clone)] +pub struct AesKey { + pub nonce: Option, + pub passwd: Option, +} + +impl AesKey { + pub fn get_key(&self) -> Option> { + if let (Some(nonce), Some(passwd)) = (&self.nonce, &self.passwd) { + let key_phrase = format!("{}-{}", nonce, passwd); + let key_phrase_hash = format!("{:X}\0", md5::compute(&key_phrase)) + .to_uppercase() + .into_bytes(); + let key = &key_phrase_hash[0..16]; + Some(key.to_vec()) + } else { + None + } + } +} + +#[derive(Debug, Clone)] pub enum EncryptionProtocol { - Unencrypted = 0, - VersionOne, - VersionThree, + Unencrypted, + BCEncrypt, + Aes(AesKey), Unknown, } @@ -86,7 +105,7 @@ pub struct BcContext { pub(super) in_bin_mode: HashSet, // Arc because it is shared between context // and connection for deserialisation and serialistion respectivly - pub(super) encryption_protocol: Arc, + pub(super) encryption_protocol: Arc>, } impl Bc { @@ -122,7 +141,7 @@ impl Bc { } } - pub fn new_from_ext_ext(meta: BcMeta, ext: Extension, xml: BcXml) -> Bc { + pub fn new_from_ext_xml(meta: BcMeta, ext: Extension, xml: BcXml) -> Bc { Bc { meta, body: BcBody::ModernMsg(ModernMsg { @@ -143,14 +162,12 @@ impl BcContext { pub fn new() -> BcContext { BcContext { in_bin_mode: HashSet::new(), - encryption_protocol: Arc::new(AtomicEncryptionProtocol::new( - EncryptionProtocol::Unencrypted, - )), + encryption_protocol: Arc::new(Mutex::new(EncryptionProtocol::Unencrypted)), } } pub fn new_with_encryption_protocol( - encryption_protocol: Arc, + encryption_protocol: Arc>, ) -> BcContext { BcContext { in_bin_mode: HashSet::new(), @@ -159,12 +176,11 @@ impl BcContext { } pub fn set_encrypted(&mut self, encryption_protocol: EncryptionProtocol) { - self.encryption_protocol - .store(encryption_protocol, Ordering::Relaxed); + *(self.encryption_protocol.lock().unwrap()) = encryption_protocol; } pub fn get_encrypted(&self) -> EncryptionProtocol { - self.encryption_protocol.load(Ordering::Relaxed) + (*(self.encryption_protocol.lock().unwrap())).clone() } } diff --git a/src/bc/samples/EncryptionProtocol02_login.pcapng b/src/bc/samples/EncryptionProtocol02_login.pcapng new file mode 100644 index 0000000000000000000000000000000000000000..11a3af10bddb81416f8d37798fc9f76a37faede1 GIT binary patch literal 13476 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 literal 0 HcmV?d00001 diff --git a/src/bc/ser.rs b/src/bc/ser.rs index 7bc13a9..f87bb45 100644 --- a/src/bc/ser.rs +++ b/src/bc/ser.rs @@ -26,7 +26,11 @@ impl Bc { // First serialize ext let (temp_buf, ext_len) = gen( opt_ref(&modern.extension, |ext| { - bc_ext(self.meta.channel_id as u32, ext, encryption_protocol) + bc_ext( + self.meta.channel_id as u32, + ext, + encryption_protocol.clone(), + ) }), vec![], )?; @@ -49,7 +53,7 @@ impl Bc { bc_payload( self.meta.channel_id as u32, payload_offset, - encryption_protocol, + encryption_protocol.clone(), ) }), temp_buf, diff --git a/src/bc/xml_crypto.rs b/src/bc/xml_crypto.rs index efc0c69..e4f5e57 100644 --- a/src/bc/xml_crypto.rs +++ b/src/bc/xml_crypto.rs @@ -1,21 +1,31 @@ use super::model::EncryptionProtocol; use log::error; +use openssl::symm::*; const XML_KEY: [u8; 8] = [0x1F, 0x2D, 0x3C, 0x4B, 0x5A, 0x69, 0x78, 0xFF]; +const IV: &[u8] = b"0123456789abcdef"; pub fn crypt(offset: u32, buf: &[u8], encryption_protocol: EncryptionProtocol) -> Vec { match encryption_protocol { EncryptionProtocol::Unencrypted => buf.to_vec(), - EncryptionProtocol::VersionOne => { + EncryptionProtocol::BCEncrypt => { let key_iter = XML_KEY.iter().cycle().skip(offset as usize % 8); key_iter .zip(buf) .map(|(key, i)| *i ^ key ^ (offset as u8)) .collect() } - EncryptionProtocol::VersionThree => { + EncryptionProtocol::Aes(key) => { // New protocol here - unimplemented!(); + let aeskey = key.get_key(); + if let Some(aeskey) = &aeskey { + let t = Cipher::aes_128_cfb128(); + decrypt(t, aeskey, Some(IV), &buf).unwrap() + } else { + // Not yet ready to decrypt (still in login phase) + // Use BCEncrypt + crypt(offset, buf, EncryptionProtocol::BCEncrypt) + } } _ => { error!("Unknown encryption protocol"); diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 58c01b4..fda0692 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -158,7 +158,7 @@ impl BcCamera { channel_id: self.channel_id, msg_num: self.new_message_num(), stream_type: 0, - response_code: 0x01dc, + response_code: 0x03dc, class: 0x6514, }, body: BcBody::LegacyMsg(LegacyMsg::LoginMsg { @@ -254,6 +254,15 @@ impl BcCamera { } } + if let EncryptionProtocol::Aes(_) = connection.get_encrypted() { + // We setup the data for the AES key now + // as all subsequent communications will use it + let nonce = Some(nonce); + let passwd = Some(password.unwrap_or("").to_string()); + let full_key = AesKey { nonce, passwd }; + connection.set_encrypted(EncryptionProtocol::Aes(full_key)); + } + Ok(device_info) } diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 2899b9a..3949c8f 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -8,7 +8,7 @@ use std::collections::BTreeMap; use std::error::Error as StdErr; // Just need the traits use std::net::{Shutdown, SocketAddr, TcpStream}; use std::sync::mpsc::{channel, Receiver, Sender}; -use std::sync::{atomic::Ordering, Arc, Mutex}; +use std::sync::{Arc, Mutex}; use std::thread::JoinHandle; use std::time::Duration; @@ -23,7 +23,7 @@ pub struct BcConnection { rx_thread: Option>, // Arc because it is shared between context // and connection for deserialisation and serialistion respectivly - encryption_protocol: Arc, + encryption_protocol: Arc>, } pub struct BcSubscription<'a> { @@ -57,9 +57,7 @@ impl BcConnection { let mut subs = subscribers.clone(); let conn = tcp_conn.try_clone()?; - let encryption_protocol = Arc::new(AtomicEncryptionProtocol::new( - EncryptionProtocol::Unencrypted, - )); + let encryption_protocol = Arc::new(Mutex::new(EncryptionProtocol::Unencrypted)); let connections_encryption_protocol = encryption_protocol.clone(); let rx_thread = std::thread::spawn(move || { let mut context = @@ -133,11 +131,11 @@ impl BcConnection { } pub fn set_encrypted(&self, value: EncryptionProtocol) { - self.encryption_protocol.store(value, Ordering::Relaxed); + *(self.encryption_protocol.lock().unwrap()) = value; } pub fn get_encrypted(&self) -> EncryptionProtocol { - self.encryption_protocol.load(Ordering::Relaxed) + (*self.encryption_protocol.lock().unwrap()).clone() } }