Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / openssl / crypto.c

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index db921d6f5137c464d0fe5248da73717c30ef09c7..8fc63e3c8f7d141bbfe2e57f7ac4124383edafbc 100644 (file)
--- 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) 2014 Guus Sliepen <guus@meshlink.io>
 
     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,21 +17,27 @@
     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);
+       RAND_load_file("/dev/urandom", 1024);
 
-        ENGINE_load_builtin_engines();
-        ENGINE_register_all_complete();
+       ENGINE_load_builtin_engines();
+       ENGINE_register_all_complete();
 
-        OpenSSL_add_all_algorithms();
+       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) {