X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fopenssl%2Fcrypto.c;h=5b866b0b0293c34c8198872f51fa4bbb59b80977;hp=db921d6f5137c464d0fe5248da73717c30ef09c7;hb=d4410d0cce40929db9a0ce7042ef962f1867234d;hpb=268c8545aaf83b7433f43402f5c77e39e20006ef

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index db921d6f..5b866b0b 100644
--- a/src/openssl/crypto.c
+++ b/src/openssl/crypto.c
@@ -1,6 +1,6 @@
 /*
     crypto.c -- Cryptographic miscellaneous functions and initialisation
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,27 +17,89 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #include <openssl/rand.h>
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 
-#include "crypto.h"
+#include "../crypto.h"
 
-void crypto_init(void) {
-        RAND_load_file("/dev/urandom", 1024);
+#ifndef HAVE_MINGW
 
-        ENGINE_load_builtin_engines();
-        ENGINE_register_all_complete();
+static int random_fd = -1;
 
-        OpenSSL_add_all_algorithms();
+static void random_init(void) {
+	random_fd = open("/dev/urandom", O_RDONLY);
+	if(random_fd < 0)
+		random_fd = open("/dev/random", O_RDONLY);
+	if(random_fd < 0) {
+		fprintf(stderr, "Could not open source of random numbers: %s\n", strerror(errno));
+		abort();
+	}
 }
 
-void crypto_exit(void) {
-	EVP_cleanup();
+static void random_exit(void) {
+	close(random_fd);
+}
+
+void randomize(void *out, size_t outlen) {
+	while(outlen) {
+		size_t len = read(random_fd, out, outlen);
+		if(len <= 0) {
+			if(errno == EAGAIN || errno == EINTR)
+				continue;
+			fprintf(stderr, "Could not read random numbers: %s\n", strerror(errno));
+			abort();
+		}
+		out += len;
+		outlen -= len;
+	}
+}
+
+#else
+
+#include <wincrypt.h>
+HCRYPTPROV prov;
+
+void random_init(void) {
+	if(!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
+		fprintf(stderr, "CryptAcquireContext() failed!\n");
+		abort();
+	}
+}
+
+void random_exit(void) {
+	CryptReleaseContext(prov, 0);
 }
 
 void randomize(void *out, size_t outlen) {
-	RAND_pseudo_bytes(out, outlen);
+	if(!CryptGenRandom(prov, outlen, out)) {
+		fprintf(stderr, "CryptGenRandom() failed\n");
+		abort();
+	}
+}
+
+#endif
+
+void crypto_init(void) {
+	random_init();
+
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+
+	ERR_load_crypto_strings();
+	OpenSSL_add_all_algorithms();
+
+	if(!RAND_status()) {
+		fprintf(stderr, "Not enough entropy for the PRNG!\n");
+		abort();
+	}
+}
+
+void crypto_exit(void) {
+	EVP_cleanup();
+	ERR_free_strings();
+	ENGINE_cleanup();
+	random_exit();
 }