Refactor crypto RNG; add getrandom() support

[tinc] / src / openssl / crypto.c

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index 8fc7e77..3960c3e 100644 (file)
--- a/src/openssl/crypto.c
+++ b/src/openssl/crypto.c
@@ -20,90 +20,17 @@
 #include "../system.h"
 
 #include <openssl/rand.h>
-#include <openssl/evp.h>
 #include <openssl/engine.h>
 
 #include "../crypto.h"
 
-#ifndef HAVE_MINGW
-
-static int random_fd = -1;
-
-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();
-       }
-}
-
-static void random_exit(void) {
-       close(random_fd);
-}
-
-void randomize(void *vout, size_t outlen) {
-       char *out = vout;
-
-       while(outlen) {
-               ssize_t len = read(random_fd, out, outlen);
-
-               if(len <= 0) {
-                       if(len == -1 && (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) {
-       if(!CryptGenRandom(prov, outlen, out)) {
-               fprintf(stderr, "CryptGenRandom() failed\n");
-               abort();
-       }
-}
-
-#endif
-
 void crypto_init(void) {
-       random_init();
-
-       uint64_t opts = OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_ENGINE_ALL_BUILTIN;
-       OPENSSL_init_crypto(opts, NULL);
+#if OPENSSL_VERSION_MAJOR < 3
+       ENGINE_load_builtin_engines();
+#endif
 
        if(!RAND_status()) {
                fprintf(stderr, "Not enough entropy for the PRNG!\n");
                abort();
        }
 }
-
-void crypto_exit(void) {
-       OPENSSL_cleanup();
-       random_exit();
-}