hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new pk

Browse Source
This commit is contained in:
rustdesk 2022-01-20 12:48:55 +08:00
parent b76a1d36cb
commit cd9faf48f3
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/client.rs
View File

@ -324,13 +324,9 @@ impl Client {
async fn secure_connection(peer_id: &str, pk: Vec<u8>, conn: &mut Stream) -> ResultType<()> { async fn secure_connection(peer_id: &str, pk: Vec<u8>, conn: &mut Stream) -> ResultType<()> {
let mut pk = pk; let mut pk = pk;
const RS_PK: &[u8; 32] = &[ let rs_pk = get_rs_pk("OeVuKk5nlHiXp+APNn0Y3pC1Iwpwn44JGqrQCsWqmBw=");
177, 155, 15, 73, 116, 147, 172, 11, 55, 38, 92, 168, 30, 116, 213, 196, 12, 134, 130, if !pk.is_empty() && rs_pk.is_some() {
170, 181, 161, 192, 176, 132, 229, 139, 178, 17, 165, 150, 51, if let Ok(data) = sign::verify(&pk, &rs_pk.unwrap()) {
];
if !pk.is_empty() {
let tmp = sign::PublicKey(*RS_PK);
if let Ok(data) = sign::verify(&pk, &tmp) {
pk = data; pk = data;
} else { } else {
log::error!("Handshake failed: invalid public key from rendezvous server"); log::error!("Handshake failed: invalid public key from rendezvous server");
@ -1226,3 +1222,15 @@ pub fn check_if_retry(msgtype: &str, title: &str, text: &str) -> bool {
&& !text.to_lowercase().contains("mismatch") && !text.to_lowercase().contains("mismatch")
&& !text.to_lowercase().contains("manually") && !text.to_lowercase().contains("manually")
} }
#[inline]
fn get_rs_pk(str_base64: &str) -> Option<sign::PublicKey> {
if let Ok(pk) = base64::decode(str_base64) {
if pk.len() == sign::PUBLICKEYBYTES {
let mut tmp = [0u8; sign::PUBLICKEYBYTES];
tmp[..].copy_from_slice(&pk);
return Some(sign::PublicKey(tmp));
}
}
None
}