From 8bbfb8bf2ae89122de8fc0a2d5b3d6f52307bca0 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 1 Nov 2016 15:34:33 -0600
Subject: [PATCH 1/3] Fix build on OS X

---
 Makefile        | 2 +-
 schemes/redoxfs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d219a17..6c05773 100644
--- a/Makefile
+++ b/Makefile
@@ -441,7 +441,7 @@ $(BUILD)/filesystem.bin: \
 		filesystem/bin/smith \
 		filesystem/bin/tar
 	rm -rf $@ $(BUILD)/filesystem/
-	echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 128
+	echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 256
 	mkdir -p $(BUILD)/filesystem/
 	cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse $@ $(BUILD)/filesystem/ &
 	sleep 2
diff --git a/schemes/redoxfs b/schemes/redoxfs
index 3a58139..a0b3817 160000
--- a/schemes/redoxfs
+++ b/schemes/redoxfs
@@ -1 +1 @@
-Subproject commit 3a58139e5762b18fd3af399f8276ec44e7ab0978
+Subproject commit a0b381765b66fe798e8b618ad5f6568cebacf0c7

From e6b11f87eec1f6a15c8a3e7226d7af6b9b789132 Mon Sep 17 00:00:00 2001
From: Tommie Levy <thomas.a.levy@gmail.com>
Date: Wed, 2 Nov 2016 01:44:13 -0400
Subject: [PATCH 2/3] Use rdrand as seed for chacha prng, when available

---
 schemes/randd/Cargo.toml  |  3 +++
 schemes/randd/src/main.rs | 48 ++++++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/schemes/randd/Cargo.toml b/schemes/randd/Cargo.toml
index 5c60f5c..92e12d5 100644
--- a/schemes/randd/Cargo.toml
+++ b/schemes/randd/Cargo.toml
@@ -1,3 +1,6 @@
 [package]
 name = "randd"
 version = "0.1.0"
+
+[dependencies]
+raw-cpuid = "2.*"
diff --git a/schemes/randd/src/main.rs b/schemes/randd/src/main.rs
index 5711601..aa7bbac 100644
--- a/schemes/randd/src/main.rs
+++ b/schemes/randd/src/main.rs
@@ -1,36 +1,39 @@
 #![feature(asm)]
+#![feature(rand)]
 
 extern crate syscall;
+extern crate raw_cpuid;
+extern crate rand;
 
 use std::fs::File;
 use std::io::{Read, Write};
 use std::thread;
 
-use syscall::{Packet, Result, Scheme};
+use rand::chacha::ChaChaRng;
+use rand::Rng;
+
+use raw_cpuid::CpuId;
+
+use syscall::{Packet, Result, SchemeMut};
 
 //TODO: Use a CSPRNG, allow write of entropy
-struct RandScheme;
+struct RandScheme {
+   prng: ChaChaRng
+}
 
-impl Scheme for RandScheme {
-    fn open(&self, _path: &[u8], _flags: usize, _uid: u32, _gid: u32) -> Result<usize> {
+impl SchemeMut for RandScheme {
+    fn open(&mut self, _path: &[u8], _flags: usize, _uid: u32, _gid: u32) -> Result<usize> {
         Ok(0)
     }
 
-    fn dup(&self, file: usize, _buf: &[u8]) -> Result<usize> {
+    fn dup(&mut self, file: usize, _buf: &[u8]) -> Result<usize> {
         Ok(file)
     }
 
-    fn read(&self, _file: usize, buf: &mut [u8]) -> Result<usize> {
+    fn read(&mut self, _file: usize, buf: &mut [u8]) -> Result<usize> {
         let mut i = 0;
         for chunk in buf.chunks_mut(8) {
-            let mut rand: u64;
-            unsafe {
-                asm!("rdrand rax"
-                    : "={rax}"(rand)
-                    :
-                    :
-                    : "intel", "volatile");
-            }
+            let mut rand = self.prng.next_u64();
             for b in chunk.iter_mut() {
                 *b = rand as u8;
                 rand = rand >> 8;
@@ -40,15 +43,28 @@ impl Scheme for RandScheme {
         Ok(i)
     }
 
-    fn close(&self, _file: usize) -> Result<usize> {
+    fn close(&mut self, _file: usize) -> Result<usize> {
         Ok(0)
     }
 }
 
 fn main(){
+    let mut has_rdrand = CpuId::new().get_feature_info().unwrap().has_rdrand();
     thread::spawn(move || {
         let mut socket = File::create(":rand").expect("rand: failed to create rand scheme");
-        let scheme = RandScheme;
+        let mut rng = ChaChaRng::new_unseeded();
+        if has_rdrand {
+            let mut rand: u64;
+            unsafe {
+                asm!("rdrand rax"
+                    : "={rax}"(rand)
+                    :
+                    :
+                    : "intel", "volatile");
+            }
+            rng.set_counter(0, rand);
+        }
+        let mut scheme = RandScheme{prng: rng};
         loop {
             let mut packet = Packet::default();
             socket.read(&mut packet).expect("rand: failed to read events from rand scheme");

From 75b0844a2a487819d71a90e005c71e774d71699d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 1 Nov 2016 20:16:44 -0600
Subject: [PATCH 3/3] Print seed indicator

---
 schemes/randd/src/main.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/schemes/randd/src/main.rs b/schemes/randd/src/main.rs
index aa7bbac..b390414 100644
--- a/schemes/randd/src/main.rs
+++ b/schemes/randd/src/main.rs
@@ -49,12 +49,16 @@ impl SchemeMut for RandScheme {
 }
 
 fn main(){
-    let mut has_rdrand = CpuId::new().get_feature_info().unwrap().has_rdrand();
+    let has_rdrand = CpuId::new().get_feature_info().unwrap().has_rdrand();
+
     thread::spawn(move || {
         let mut socket = File::create(":rand").expect("rand: failed to create rand scheme");
+
         let mut rng = ChaChaRng::new_unseeded();
+
         if has_rdrand {
-            let mut rand: u64;
+            println!("rand: seeding with rdrand");
+            let rand: u64;
             unsafe {
                 asm!("rdrand rax"
                     : "={rax}"(rand)
@@ -63,7 +67,10 @@ fn main(){
                     : "intel", "volatile");
             }
             rng.set_counter(0, rand);
+        } else {
+            println!("rand: unseeded");
         }
+
         let mut scheme = RandScheme{prng: rng};
         loop {
             let mut packet = Packet::default();