Fixes for CI, CloudABI, 32-bit Linux, MacOS, WASM

Also new: impl From<NonZeroU32> for Error

Author: dhardy

.travis.yml

@@ -77,7 +77,7 @@ matrix:
         - cargo build --target wasm32-unknown-unknown --features=wasm-bindgen
         - cargo web test --target wasm32-unknown-unknown --features=stdweb
         - cargo build --manifest-path tests/wasm_bindgen/Cargo.toml --target wasm32-unknown-unknown
-        - wasm-bindgen --nodejs target/wasm32-unknown-unknown/debug/rand_wasm_bindgen_test.wasm --out-dir tests/wasm_bindgen/js
+        - wasm-bindgen --nodejs target/wasm32-unknown-unknown/debug/getrandom_wasm_bindgen_test.wasm --out-dir tests/wasm_bindgen/js
         - node tests/wasm_bindgen/js/index.js
         - wasm-pack test --node tests/wasm_bindgen
 

Cargo.toml

@@ -20,6 +20,9 @@ libc = "0.2"
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["minwindef", "ntsecapi", "winnt"] }
 
+[target.'cfg(target_os = "cloudabi")'.dependencies]
+cloudabi = "0.0.3"
+
 [target.'cfg(fuchsia)'.dependencies]
 fuchsia-cprng = "0.1"
 

src/cloudabi.rs

@@ -5,19 +5,20 @@
 // <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-use error::Error;
 
-extern "C" {
-    fn cloudabi_sys_random_get(buf: *mut u8, len: usize) -> u16;
-}
+//! Implementation for CloudABI
+
+extern crate cloudabi;
+
+use core::num::NonZeroU32;
+use error::Error;
 
 pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
-    let errno = unsafe { cloudabi_sys_random_get(dest.as_ptr(), dest.len()) };
-    if errno == 0 {
+    let errno = unsafe { cloudabi::random_get(dest) };
+    if errno == cloudabi::errno::SUCCESS {
         Ok(())
     } else {
-        Err(Error(unsafe {
-            NonZeroU32::new_unchecked(errno as u32)
-        }))
+        let code = NonZeroU32::new(errno as u32).unwrap();
+        Err(Error::from(code))
     }
 }

src/error.rs

@@ -50,6 +50,12 @@ impl fmt::Display for Error {
     }
 }
 
+impl From<NonZeroU32> for Error {
+    fn from(code: NonZeroU32) -> Self {
+        Error(code)
+    }
+}
+
 #[cfg(not(target_env = "sgx"))]
 impl From<io::Error> for Error {
     fn from(err: io::Error) -> Self {

src/linux_android.rs

@@ -32,7 +32,7 @@ fn syscall_getrandom(dest: &mut [u8]) -> Result<(), io::Error> {
     let ret = unsafe {
         libc::syscall(libc::SYS_getrandom, dest.as_mut_ptr(), dest.len(), 0)
     };
-    if ret == -1 || ret != dest.len() as i64 {
+    if ret < 0 || (ret as usize) != dest.len() {
         return Err(io::Error::last_os_error());
     }
     Ok(())

src/macos.rs

@@ -7,8 +7,11 @@
 // except according to those terms.
 
 //! Implementation for MacOS / iOS
+extern crate libc;
+
 use super::Error;
 use std::io;
+use self::libc::{c_int, size_t};
 
 enum SecRandom {}
 

src/wasm32_stdweb.rs

@@ -27,7 +27,7 @@ thread_local!(
     static RNG_SOURCE: RefCell<Option<RngSource>> = RefCell::new(None);
 );
 
-pub fn getrandom_inner(mut dest: &mut [u8]) -> Result<(), Error> {
+pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     assert_eq!(mem::size_of::<usize>(), 4);
 
     RNG_SOURCE.with(|f| {
@@ -69,7 +69,7 @@ fn getrandom_init() -> Result<RngSource, Error> {
     }
 }
 
-fn getrandom_fill(source: &mut RngSource, mut dest: &mut [u8]) -> Result<(), Error> {
+fn getrandom_fill(source: &mut RngSource, dest: &mut [u8]) -> Result<(), Error> {
     for chunk in dest.chunks_mut(65536) {
         let len = chunk.len() as u32;
         let ptr = chunk.as_mut_ptr() as i32;