diff options
Diffstat (limited to 'ext/crypto/encrypt.rs')
-rw-r--r-- | ext/crypto/encrypt.rs | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/ext/crypto/encrypt.rs b/ext/crypto/encrypt.rs index b263873e4..b5eef46dc 100644 --- a/ext/crypto/encrypt.rs +++ b/ext/crypto/encrypt.rs @@ -24,10 +24,7 @@ use deno_core::JsBuffer; use deno_core::ToJsBuffer; use rand::rngs::OsRng; use rsa::pkcs1::DecodeRsaPublicKey; -use rsa::PaddingScheme; -use rsa::PublicKey; use serde::Deserialize; -use sha1::Digest; use sha1::Sha1; use sha2::Sha256; use sha2::Sha384; @@ -119,24 +116,24 @@ fn encrypt_rsa_oaep( .map_err(|_| operation_error("failed to decode public key"))?; let mut rng = OsRng; let padding = match hash { - ShaHash::Sha1 => PaddingScheme::OAEP { - digest: Box::new(Sha1::new()), - mgf_digest: Box::new(Sha1::new()), + ShaHash::Sha1 => rsa::Oaep { + digest: Box::<Sha1>::default(), + mgf_digest: Box::<Sha1>::default(), label: Some(label), }, - ShaHash::Sha256 => PaddingScheme::OAEP { - digest: Box::new(Sha256::new()), - mgf_digest: Box::new(Sha256::new()), + ShaHash::Sha256 => rsa::Oaep { + digest: Box::<Sha256>::default(), + mgf_digest: Box::<Sha256>::default(), label: Some(label), }, - ShaHash::Sha384 => PaddingScheme::OAEP { - digest: Box::new(Sha384::new()), - mgf_digest: Box::new(Sha384::new()), + ShaHash::Sha384 => rsa::Oaep { + digest: Box::<Sha384>::default(), + mgf_digest: Box::<Sha384>::default(), label: Some(label), }, - ShaHash::Sha512 => PaddingScheme::OAEP { - digest: Box::new(Sha512::new()), - mgf_digest: Box::new(Sha512::new()), + ShaHash::Sha512 => rsa::Oaep { + digest: Box::<Sha512>::default(), + mgf_digest: Box::<Sha512>::default(), label: Some(label), }, }; |