G2/minidisc-cli
1
0
Fork 0
mirror of https://github.com/G2-Games/minidisc-cli.git synced 2025-04-19 11:42:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix return type for send_track, make session fields public

Browse source
This commit is contained in:
asivery 2024-02-01 05:59:13 +01:00
parent 48ea6567bc
commit be1a3c445d
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
minidisc-rs/src/netmd/interface.rs
View file

@ -7,7 +7,6 @@ use crate::netmd::utils::{
}; };
use cbc::cipher::block_padding::NoPadding; use cbc::cipher::block_padding::NoPadding;
use cbc::cipher::{KeyIvInit, BlockEncryptMut, BlockDecryptMut, KeyInit}; use cbc::cipher::{KeyIvInit, BlockEncryptMut, BlockDecryptMut, KeyInit};
use cross_usb::UsbDevice;
use encoding_rs::SHIFT_JIS; use encoding_rs::SHIFT_JIS;
use rand::RngCore; use rand::RngCore;
use std::collections::HashMap; use std::collections::HashMap;
@ -1366,7 +1365,7 @@ impl NetMDInterface {
keychain: [[u8; 16]; 2], keychain: [[u8; 16]; 2],
depth: i32, depth: i32,
ekbsignature: [u8; 24], ekbsignature: [u8; 24],
) -> Result<Vec<u8>, Box<dyn Error>> { ) -> Result<(), Box<dyn Error>> {
let chainlen = keychain.len(); let chainlen = keychain.len();
let databytes = 16 + 16 * chainlen + 24; let databytes = 16 + 16 * chainlen + 24;
@ -1394,12 +1393,12 @@ impl NetMDInterface {
let reply = self.send_query(&mut query, false, false).await?; let reply = self.send_query(&mut query, false, false).await?;
let res = scan_query( scan_query(
reply, reply,
"1800 080046 f0030103 12 01 %?%? %?%?%?%?".to_string(), "1800 080046 f0030103 12 01 %?%? %?%?%?%?".to_string(),
)?; )?;
Ok(res[0].to_vec().unwrap()) Ok(())
} }
pub async fn session_key_exchange( pub async fn session_key_exchange(
@ -1710,9 +1709,9 @@ impl MDTrack {
} }
pub struct MDSession { pub struct MDSession {
md: NetMDInterface, pub md: NetMDInterface,
ekb_object: EKBOpenSource, pub ekb_object: EKBOpenSource,
hex_session_key: Option<Vec<u8>>, pub hex_session_key: Option<Vec<u8>>,
} }
impl MDSession { impl MDSession {
@ -1722,7 +1721,7 @@ impl MDSession {
let ekb = self.ekb_object.ekb_data_for_leaf_id(); let ekb = self.ekb_object.ekb_data_for_leaf_id();
self.md.send_key_data(self.ekb_object.ekb_id(), ekb.chains, ekb.depth, ekb.signature).await?; self.md.send_key_data(self.ekb_object.ekb_id(), ekb.chains, ekb.depth, ekb.signature).await?;
let mut nonce = vec![0u8, 8]; let mut nonce = vec![0u8; 8];
rand::thread_rng().fill_bytes(&mut nonce); rand::thread_rng().fill_bytes(&mut nonce);
let mut devnonce = self.md.session_key_exchange(nonce.clone()).await?; let mut devnonce = self.md.session_key_exchange(nonce.clone()).await?;