41a8b9aec9
<!-- Please describe your changes on the following line: --> - Changed the `Crypto.webidl` file to allow getRandomValues to recieve an ArrayBufferView as input - Removed unnecesary checks from `crypto.rs` and did the necessary changes to match the `webidl` changes. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #20350 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: e5b606f6a41058bdcc5745ab0da075d0e6ed52fb
78 lines
2.4 KiB
Rust
78 lines
2.4 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::cell::DomRefCell;
|
|
use dom::bindings::codegen::Bindings::CryptoBinding;
|
|
use dom::bindings::codegen::Bindings::CryptoBinding::CryptoMethods;
|
|
use dom::bindings::error::{Error, Fallible};
|
|
use dom::bindings::reflector::{Reflector, reflect_dom_object};
|
|
use dom::bindings::root::DomRoot;
|
|
use dom::globalscope::GlobalScope;
|
|
use dom_struct::dom_struct;
|
|
use js::jsapi::{JSContext, JSObject};
|
|
use js::jsapi::Type;
|
|
use js::rust::CustomAutoRooterGuard;
|
|
use js::typedarray::ArrayBufferView;
|
|
use servo_rand::{ServoRng, Rng};
|
|
use std::ptr::NonNull;
|
|
|
|
unsafe_no_jsmanaged_fields!(ServoRng);
|
|
|
|
// https://developer.mozilla.org/en-US/docs/Web/API/Crypto
|
|
#[dom_struct]
|
|
pub struct Crypto {
|
|
reflector_: Reflector,
|
|
#[ignore_malloc_size_of = "Defined in rand"]
|
|
rng: DomRefCell<ServoRng>,
|
|
}
|
|
|
|
impl Crypto {
|
|
fn new_inherited() -> Crypto {
|
|
Crypto {
|
|
reflector_: Reflector::new(),
|
|
rng: DomRefCell::new(ServoRng::new()),
|
|
}
|
|
}
|
|
|
|
pub fn new(global: &GlobalScope) -> DomRoot<Crypto> {
|
|
reflect_dom_object(Box::new(Crypto::new_inherited()), global, CryptoBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
impl CryptoMethods for Crypto {
|
|
#[allow(unsafe_code)]
|
|
// https://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html#Crypto-method-getRandomValues
|
|
unsafe fn GetRandomValues(&self,
|
|
_cx: *mut JSContext,
|
|
mut input: CustomAutoRooterGuard<ArrayBufferView>)
|
|
-> Fallible<NonNull<JSObject>> {
|
|
let array_type = input.get_array_type();
|
|
|
|
if !is_integer_buffer(array_type) {
|
|
return Err(Error::TypeMismatch);
|
|
} else {
|
|
let mut data = input.as_mut_slice();
|
|
if data.len() > 65536 {
|
|
return Err(Error::QuotaExceeded);
|
|
}
|
|
self.rng.borrow_mut().fill_bytes(&mut data);
|
|
}
|
|
|
|
Ok(NonNull::new_unchecked(*input.underlying_object()))
|
|
}
|
|
}
|
|
|
|
fn is_integer_buffer(array_type: Type) -> bool {
|
|
match array_type {
|
|
Type::Uint8 |
|
|
Type::Uint8Clamped |
|
|
Type::Int8 |
|
|
Type::Uint16 |
|
|
Type::Int16 |
|
|
Type::Uint32 |
|
|
Type::Int32 => true,
|
|
_ => false,
|
|
}
|
|
}
|