aboutsummaryrefslogtreecommitdiff
path: root/getrandom/src/use_file.rs
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2020-04-04 14:39:19 -0700
committerDaniel Mueller <deso@posteo.net>2020-04-04 14:39:19 -0700
commitd0d9683df8398696147e7ee1fcffb2e4e957008c (patch)
tree4baa76712a76f4d072ee3936c07956580b230820 /getrandom/src/use_file.rs
parent203e691f46d591a2cc8acdfd850fa9f5b0fb8a98 (diff)
downloadnitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.gz
nitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.bz2
Remove vendored dependencies
While it appears that by now we actually can get successful builds without Cargo insisting on Internet access by virtue of using the --frozen flag, maintaining vendored dependencies is somewhat of a pain point. This state will also get worse with upcoming changes that replace argparse in favor of structopt and pull in a slew of new dependencies by doing so. Then there is also the repository structure aspect, which is non-standard due to the way we vendor dependencies and a potential source of confusion. In order to fix these problems, this change removes all the vendored dependencies we have. Delete subrepo argparse/:argparse Delete subrepo base32/:base32 Delete subrepo cc/:cc Delete subrepo cfg-if/:cfg-if Delete subrepo getrandom/:getrandom Delete subrepo lazy-static/:lazy-static Delete subrepo libc/:libc Delete subrepo nitrokey-sys/:nitrokey-sys Delete subrepo nitrokey/:nitrokey Delete subrepo rand/:rand
Diffstat (limited to 'getrandom/src/use_file.rs')
-rw-r--r--getrandom/src/use_file.rs73
1 files changed, 0 insertions, 73 deletions
diff --git a/getrandom/src/use_file.rs b/getrandom/src/use_file.rs
deleted file mode 100644
index d3adaf2..0000000
--- a/getrandom/src/use_file.rs
+++ /dev/null
@@ -1,73 +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.
-
-//! 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) }
- }
- }
-}