github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reuse librespot-core's Diffie Hellman in discovery

Browse source
This commit is contained in:
johannesd3 2021-03-10 22:55:40 +01:00
parent 11ce29077e
commit 7ddb1a20bb
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1344,7 +1344,6 @@ dependencies = [
"librespot-playback", "librespot-playback",
"librespot-protocol", "librespot-protocol",
"log", "log",
"num-bigint",
"protobuf", "protobuf",
"rand", "rand",
"serde", "serde",

1
connect/Cargo.toml
View file

@ -16,7 +16,6 @@ futures-util = { version = "0.3", default_features = false }
hmac = "0.10" hmac = "0.10"
hyper = { version = "0.14", features = ["server", "http1", "tcp"] } hyper = { version = "0.14", features = ["server", "http1", "tcp"] }
log = "0.4" log = "0.4"
num-bigint = "0.3"
protobuf = "~2.14.0" protobuf = "~2.14.0"
rand = "0.8" rand = "0.8"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

27
connect/src/discovery.rs
View file

@ -5,7 +5,6 @@ use futures_core::Stream;
use hmac::{Hmac, Mac, NewMac}; use hmac::{Hmac, Mac, NewMac};
use hyper::service::{make_service_fn, service_fn}; use hyper::service::{make_service_fn, service_fn};
use hyper::{Body, Method, Request, Response, StatusCode}; use hyper::{Body, Method, Request, Response, StatusCode};
use num_bigint::BigUint;
use serde_json::json; use serde_json::json;
use sha1::{Digest, Sha1}; use sha1::{Digest, Sha1};
use tokio::sync::{mpsc, oneshot}; use tokio::sync::{mpsc, oneshot};
@ -15,8 +14,7 @@ use dns_sd::DNSService;
use librespot_core::authentication::Credentials; use librespot_core::authentication::Credentials;
use librespot_core::config::ConnectConfig; use librespot_core::config::ConnectConfig;
use librespot_core::diffie_hellman::{DH_GENERATOR, DH_PRIME}; use librespot_core::diffie_hellman::DhLocalKeys;
use librespot_core::util;
use std::borrow::Cow; use std::borrow::Cow;
use std::collections::BTreeMap; use std::collections::BTreeMap;
@ -34,8 +32,7 @@ struct Discovery(Arc<DiscoveryInner>);
struct DiscoveryInner { struct DiscoveryInner {
config: ConnectConfig, config: ConnectConfig,
device_id: String, device_id: String,
private_key: BigUint, keys: DhLocalKeys,
public_key: BigUint,
tx: mpsc::UnboundedSender<Credentials>, tx: mpsc::UnboundedSender<Credentials>,
} }
@ -46,15 +43,10 @@ impl Discovery {
) -> (Discovery, mpsc::UnboundedReceiver<Credentials>) { ) -> (Discovery, mpsc::UnboundedReceiver<Credentials>) {
let (tx, rx) = mpsc::unbounded_channel(); let (tx, rx) = mpsc::unbounded_channel();
let key_data = util::rand_vec(&mut rand::thread_rng(), 95);
let private_key = BigUint::from_bytes_be(&key_data);
let public_key = util::powm(&DH_GENERATOR, &private_key, &DH_PRIME);
let discovery = Discovery(Arc::new(DiscoveryInner { let discovery = Discovery(Arc::new(DiscoveryInner {
config, config,
device_id, device_id,
private_key, keys: DhLocalKeys::random(&mut rand::thread_rng()),
public_key,
tx, tx,
})); }));
@ -62,8 +54,7 @@ impl Discovery {
} }
fn handle_get_info(&self, _: BTreeMap<Cow<'_, str>, Cow<'_, str>>) -> Response<hyper::Body> { fn handle_get_info(&self, _: BTreeMap<Cow<'_, str>, Cow<'_, str>>) -> Response<hyper::Body> {
let public_key = self.0.public_key.to_bytes_be(); let public_key = base64::encode(&self.0.keys.public_key());
let public_key = base64::encode(&public_key);
let result = json!({ let result = json!({
"status": 101, "status": 101,
@ -98,16 +89,16 @@ impl Discovery {
let encrypted_blob = base64::decode(encrypted_blob.as_bytes()).unwrap(); let encrypted_blob = base64::decode(encrypted_blob.as_bytes()).unwrap();
let client_key = base64::decode(client_key.as_bytes()).unwrap(); let shared_key = self
let client_key = BigUint::from_bytes_be(&client_key); .0
.keys
let shared_key = util::powm(&client_key, &self.0.private_key, &DH_PRIME); .shared_secret(&base64::decode(client_key.as_bytes()).unwrap());
let iv = &encrypted_blob[0..16]; let iv = &encrypted_blob[0..16];
let encrypted = &encrypted_blob[16..encrypted_blob.len() - 20]; let encrypted = &encrypted_blob[16..encrypted_blob.len() - 20];
let cksum = &encrypted_blob[encrypted_blob.len() - 20..encrypted_blob.len()]; let cksum = &encrypted_blob[encrypted_blob.len() - 20..encrypted_blob.len()];
let base_key = Sha1::digest(&shared_key.to_bytes_be()); let base_key = Sha1::digest(&shared_key);
let base_key = &base_key[..16]; let base_key = &base_key[..16];
let checksum_key = { let checksum_key = {