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
---
 getrandom/src/use_file.rs | 73 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 getrandom/src/use_file.rs

(limited to 'getrandom/src/use_file.rs')

diff --git a/getrandom/src/use_file.rs b/getrandom/src/use_file.rs
new file mode 100644
index 0000000..d3adaf2
--- /dev/null
+++ b/getrandom/src/use_file.rs
@@ -0,0 +1,73 @@
+// 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.
+
+//! Implementations that just need to read from a file
+use crate::util_libc::{last_os_error, open_readonly, sys_fill_exact, LazyFd};
+use crate::Error;
+
+#[cfg(target_os = "redox")]
+const FILE_PATH: &str = "rand:\0";
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "emscripten",
+    target_os = "haiku",
+    target_os = "macos",
+    target_os = "solaris",
+    target_os = "illumos"
+))]
+const FILE_PATH: &str = "/dev/random\0";
+
+pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
+    static FD: LazyFd = LazyFd::new();
+    let fd = FD.init(init_file).ok_or_else(last_os_error)?;
+    let read = |buf: &mut [u8]| unsafe { libc::read(fd, buf.as_mut_ptr() as *mut _, buf.len()) };
+
+    if cfg!(target_os = "emscripten") {
+        // `Crypto.getRandomValues` documents `dest` should be at most 65536 bytes.
+        for chunk in dest.chunks_mut(65536) {
+            sys_fill_exact(chunk, read)?;
+        }
+    } else {
+        sys_fill_exact(dest, read)?;
+    }
+    Ok(())
+}
+
+cfg_if! {
+    if #[cfg(any(target_os = "android", target_os = "linux"))] {
+        fn init_file() -> Option<libc::c_int> {
+            // Poll /dev/random to make sure it is ok to read from /dev/urandom.
+            let mut pfd = libc::pollfd {
+                fd: unsafe { open_readonly("/dev/random\0")? },
+                events: libc::POLLIN,
+                revents: 0,
+            };
+
+            let ret = loop {
+                // A negative timeout means an infinite timeout.
+                let res = unsafe { libc::poll(&mut pfd, 1, -1) };
+                if res == 1 {
+                    break unsafe { open_readonly("/dev/urandom\0") };
+                } else if res < 0 {
+                    let e = last_os_error().raw_os_error();
+                    if e == Some(libc::EINTR) || e == Some(libc::EAGAIN) {
+                        continue;
+                    }
+                }
+                // We either hard failed, or poll() returned the wrong pfd.
+                break None;
+            };
+            unsafe { libc::close(pfd.fd) };
+            ret
+        }
+    } else {
+        fn init_file() -> Option<libc::c_int> {
+            unsafe { open_readonly(FILE_PATH) }
+        }
+    }
+}
-- 
cgit v1.2.1