From fd091b04316db9dc5fafadbd6bdbe60b127408a9 Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Thu, 2 Jan 2020 08:32:06 -0800
Subject: Update nitrokey crate to 0.4.0

This change finally updates the version of the nitrokey crate that we
consume to 0.4.0. Along with that we update rand_core, one of its
dependencies, to 0.5.1. Further more we add cfg-if in version 0.1.10 and
getrandom in version 0.1.13, both of which are now new (non-development)
dependencies.

Import subrepo nitrokey/:nitrokey at e81057037e9b4f370b64c0a030a725bc6bdfb870
Import subrepo cfg-if/:cfg-if at 4484a6faf816ff8058088ad857b0c6bb2f4b02b2
Import subrepo getrandom/:getrandom at d661aa7e1b8cc80b47dabe3d2135b3b47d2858af
Import subrepo rand/:rand at d877ed528248b52d947e0484364a4e1ae59ca502
---
 rand/rand_os/src/wasm32_stdweb.rs | 107 --------------------------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 rand/rand_os/src/wasm32_stdweb.rs

(limited to 'rand/rand_os/src/wasm32_stdweb.rs')

diff --git a/rand/rand_os/src/wasm32_stdweb.rs b/rand/rand_os/src/wasm32_stdweb.rs
deleted file mode 100644
index 3be0ce6..0000000
--- a/rand/rand_os/src/wasm32_stdweb.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2018 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <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.
-
-//! Implementation for WASM via stdweb
-
-use std::mem;
-use stdweb::unstable::TryInto;
-use stdweb::web::error::Error as WebError;
-use rand_core::{Error, ErrorKind};
-use super::OsRngImpl;
-
-#[derive(Clone, Debug)]
-enum OsRngMethod {
-    Browser,
-    Node
-}
-
-#[derive(Clone, Debug)]
-pub struct OsRng(OsRngMethod);
-
-impl OsRngImpl for OsRng {
-    fn new() -> Result<OsRng, Error> {
-        let result = js! {
-            try {
-                if (
-                    typeof self === "object" &&
-                    typeof self.crypto === "object" &&
-                    typeof self.crypto.getRandomValues === "function"
-                ) {
-                    return { success: true, ty: 1 };
-                }
-
-                if (typeof require("crypto").randomBytes === "function") {
-                    return { success: true, ty: 2 };
-                }
-
-                return { success: false, error: new Error("not supported") };
-            } catch(err) {
-                return { success: false, error: err };
-            }
-        };
-
-        if js!{ return @{ result.as_ref() }.success } == true {
-            let ty = js!{ return @{ result }.ty };
-
-            if ty == 1 { Ok(OsRng(OsRngMethod::Browser)) }
-            else if ty == 2 { Ok(OsRng(OsRngMethod::Node)) }
-            else { unreachable!() }
-        } else {
-            let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
-            Err(Error::with_cause(ErrorKind::Unavailable, "WASM Error", err))
-        }
-    }
-
-
-    fn fill_chunk(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        assert_eq!(mem::size_of::<usize>(), 4);
-
-        let len = dest.len() as u32;
-        let ptr = dest.as_mut_ptr() as i32;
-
-        let result = match self.0 {
-            OsRngMethod::Browser => js! {
-                try {
-                    let array = new Uint8Array(@{ len });
-                    self.crypto.getRandomValues(array);
-                    HEAPU8.set(array, @{ ptr });
-
-                    return { success: true };
-                } catch(err) {
-                    return { success: false, error: err };
-                }
-            },
-            OsRngMethod::Node => js! {
-                try {
-                    let bytes = require("crypto").randomBytes(@{ len });
-                    HEAPU8.set(new Uint8Array(bytes), @{ ptr });
-
-                    return { success: true };
-                } catch(err) {
-                    return { success: false, error: err };
-                }
-            }
-        };
-
-        if js!{ return @{ result.as_ref() }.success } == true {
-            Ok(())
-        } else {
-            let err: WebError = js!{ return @{ result }.error }.try_into().unwrap();
-            Err(Error::with_cause(ErrorKind::Unexpected, "WASM Error", err))
-        }
-    }
-
-    fn max_chunk_size(&self) -> usize { 65536 }
-
-    fn method_str(&self) -> &'static str {
-        match self.0 {
-            OsRngMethod::Browser => "Crypto.getRandomValues",
-            OsRngMethod::Node => "crypto.randomBytes",
-        }
-    }
-}
-- 
cgit v1.2.1