github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-11-08 16:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: workaround for Session::connect() future being !Send

Browse source 
rsa::padding::PaddingScheme is !Send, making it impossible to call
Session::connect() with an executor requiring Send futures, such as
Rocket.

Fix #1065
This commit is contained in:
Guillaume Desmottes 2022-10-20 17:17:46 +02:00
parent 29ec49b74c
commit 1a48bc87c8
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/connection/handshake.rs
View file

@ -77,9 +77,11 @@ pub async fn handshake<T: AsyncRead + AsyncWrite + Unpin>(
})?;
let hash = Sha1::digest(&remote_key);
let padding = rsa::padding::PaddingScheme::new_pkcs1v15_sign(Some(rsa::hash::Hash::SHA1));
let padding = PaddingScheme(rsa::padding::PaddingScheme::new_pkcs1v15_sign(Some(
rsa::hash::Hash::SHA1,
)));
public_key
.verify(padding, &hash, &remote_signature)
.verify(padding.0, &hash, &remote_signature)
.map_err(|_| {
io::Error::new(
io::ErrorKind::InvalidData,
@ -97,6 +99,13 @@ pub async fn handshake<T: AsyncRead + AsyncWrite + Unpin>(
Ok(codec.framed(connection))
}
// Workaround for https://github.com/RustCrypto/RSA/issues/214
struct PaddingScheme(rsa::padding::PaddingScheme);
/// # Safety
/// The `rsa::padding::PaddingScheme` variant we use is actually `Send`.
unsafe impl Send for PaddingScheme {}
async fn client_hello<T>(connection: &mut T, gc: Vec<u8>) -> io::Result<Vec<u8>>
where
T: AsyncWrite + Unpin,