From 34432e915e8415b112c09dc1a50366a457d0322e Mon Sep 17 00:00:00 2001
From: Andrew Ayer <agwa@andrewayer.name>
Date: Mon, 30 Dec 2013 14:36:59 -0800
Subject: [PATCH] Use OpenSSL's RNG instead of /dev/random

Rationale:

 * /dev/random blocks unpredictably on Linux, leading to slow
   key generation.
 * OpenSSL's RNG is more cross-platform than /dev/(u)random.
   Some platforms might not have a (u)random device, or worse,
   have a /dev/(u)random that produces insecure random numbers
   (like Cygwin, apparently).
---
 commands.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/commands.cpp b/commands.cpp
index 89786d7..b3180c5 100644
--- a/commands.cpp
+++ b/commands.cpp
@@ -42,6 +42,8 @@
 #include <iostream>
 #include <cstddef>
 #include <cstring>
+#include <openssl/rand.h>
+#include <openssl/err.h>
 
 // Encrypt contents of stdin and write to stdout
 void clean (const char* keyfile)
@@ -293,21 +295,17 @@ void keygen (const char* keyfile)
 		std::exit(1);
 	}
 	umask(old_umask);
-	std::ifstream	randin;
-	randin.rdbuf()->pubsetbuf(0, 0); // disable buffering so we don't take more entropy than needed
-	randin.open("/dev/random", std::ios::binary);
-	if (!randin) {
-		perror("/dev/random");
-		std::exit(1);
-	}
-	std::clog << "Generating key... this may take a while. Please type on the keyboard, move the\n";
-	std::clog << "mouse, utilize the disks, etc. to give the random number generator more entropy.\n";
+
+	std::clog << "Generating key...\n";
 	std::clog.flush();
-	char		buffer[AES_KEY_BITS/8 + HMAC_KEY_LEN];
-	randin.read(buffer, sizeof(buffer));
-	if (randin.gcount() != sizeof(buffer)) {
-		std::clog << "Premature end of random data.\n";
+	unsigned char	buffer[AES_KEY_BITS/8 + HMAC_KEY_LEN];
+	if (RAND_bytes(buffer, sizeof(buffer)) != 1) {
+		while (unsigned long code = ERR_get_error()) {
+			char	error_string[120];
+			ERR_error_string_n(code, error_string, sizeof(error_string));
+			std::clog << "Error: " << error_string << '\n';
+		}
 		std::exit(1);
 	}
-	keyout.write(buffer, sizeof(buffer));
+	keyout.write(reinterpret_cast<const char*>(buffer), sizeof(buffer));
 }