Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

clippy: Fix warnings in subtlecrypto.rs (#33943)

Browse source 
Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>
This commit is contained in:
tanishka 2024-10-21 16:13:47 +05:30 • committed by GitHub
parent 2319764a1e
commit 66695d2f7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/config/prefs.rs
View file

@ -174,14 +174,6 @@ mod gen {
13 13
} }
fn black() -> i64 {
0x000000
}
fn white() -> i64 {
0xFFFFFF
}
build_structs! { build_structs! {
// type of the accessors // type of the accessors
accessor_type = crate::pref_util::Accessor::<Prefs, crate::pref_util::PrefValue>, accessor_type = crate::pref_util::Accessor::<Prefs, crate::pref_util::PrefValue>,

26
components/script/dom/subtlecrypto.rs
View file

@ -508,7 +508,7 @@ fn normalize_algorithm(
(ALG_AES_CBC, "importKey") => Ok(NormalizedAlgorithm::Algorithm(SubtleAlgorithm { (ALG_AES_CBC, "importKey") => Ok(NormalizedAlgorithm::Algorithm(SubtleAlgorithm {
name: ALG_AES_CBC.to_string(), name: ALG_AES_CBC.to_string(),
})), })),
_ => return Err(Error::NotSupported), _ => Err(Error::NotSupported),
} }
}, },
} }
@ -528,21 +528,21 @@ impl SubtleCrypto {
return Err(Error::Operation); return Err(Error::Operation);
} }
let mut plaintext = Vec::from(data); let plaintext = Vec::from(data);
let iv = GenericArray::from_slice(&params.iv); let iv = GenericArray::from_slice(&params.iv);
let ct = match key.handle() { let ct = match key.handle() {
Handle::Aes128(data) => { Handle::Aes128(data) => {
let key_data = GenericArray::from_slice(&data); let key_data = GenericArray::from_slice(data);
Aes128CbcEnc::new(key_data, iv).encrypt_padded_vec_mut::<Pkcs7>(&mut plaintext) Aes128CbcEnc::new(key_data, iv).encrypt_padded_vec_mut::<Pkcs7>(&plaintext)
}, },
Handle::Aes192(data) => { Handle::Aes192(data) => {
let key_data = GenericArray::from_slice(&data); let key_data = GenericArray::from_slice(data);
Aes192CbcEnc::new(key_data, iv).encrypt_padded_vec_mut::<Pkcs7>(&mut plaintext) Aes192CbcEnc::new(key_data, iv).encrypt_padded_vec_mut::<Pkcs7>(&plaintext)
}, },
Handle::Aes256(data) => { Handle::Aes256(data) => {
let key_data = GenericArray::from_slice(&data); let key_data = GenericArray::from_slice(data);
Aes256CbcEnc::new(key_data, iv).encrypt_padded_vec_mut::<Pkcs7>(&mut plaintext) Aes256CbcEnc::new(key_data, iv).encrypt_padded_vec_mut::<Pkcs7>(&plaintext)
}, },
}; };
@ -570,19 +570,19 @@ impl SubtleCrypto {
let plaintext = match key.handle() { let plaintext = match key.handle() {
Handle::Aes128(data) => { Handle::Aes128(data) => {
let key_data = GenericArray::from_slice(&data); let key_data = GenericArray::from_slice(data);
Aes128CbcDec::new(key_data, iv) Aes128CbcDec::new(key_data, iv)
.decrypt_padded_mut::<Pkcs7>(ciphertext.as_mut_slice()) .decrypt_padded_mut::<Pkcs7>(ciphertext.as_mut_slice())
.map_err(|_| Error::Operation)? .map_err(|_| Error::Operation)?
}, },
Handle::Aes192(data) => { Handle::Aes192(data) => {
let key_data = GenericArray::from_slice(&data); let key_data = GenericArray::from_slice(data);
Aes192CbcDec::new(key_data, iv) Aes192CbcDec::new(key_data, iv)
.decrypt_padded_mut::<Pkcs7>(ciphertext.as_mut_slice()) .decrypt_padded_mut::<Pkcs7>(ciphertext.as_mut_slice())
.map_err(|_| Error::Operation)? .map_err(|_| Error::Operation)?
}, },
Handle::Aes256(data) => { Handle::Aes256(data) => {
let key_data = GenericArray::from_slice(&data); let key_data = GenericArray::from_slice(data);
Aes256CbcDec::new(key_data, iv) Aes256CbcDec::new(key_data, iv)
.decrypt_padded_mut::<Pkcs7>(ciphertext.as_mut_slice()) .decrypt_padded_mut::<Pkcs7>(ciphertext.as_mut_slice())
.map_err(|_| Error::Operation)? .map_err(|_| Error::Operation)?
@ -709,7 +709,7 @@ impl SubtleCrypto {
x: None, x: None,
y: None, y: None,
}; };
Ok(AesExportedKey::Jwk(jwk)) Ok(AesExportedKey::Jwk(Box::new(jwk)))
}, },
_ => Err(Error::NotSupported), _ => Err(Error::NotSupported),
} }
@ -718,7 +718,7 @@ impl SubtleCrypto {
pub enum AesExportedKey { pub enum AesExportedKey {
Raw(Vec<u8>), Raw(Vec<u8>),
Jwk(JsonWebKey), Jwk(Box<JsonWebKey>),
} }
fn data_to_jwk_params(alg: &str, key: &[u8]) -> (DOMString, DOMString) { fn data_to_jwk_params(alg: &str, key: &[u8]) -> (DOMString, DOMString) {