/*
crypto.c -- Cryptographic miscellaneous functions and initialisation
- Copyright (C) 2007-2014 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007-2021 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
#include "../system.h"
#include <openssl/rand.h>
-#include <openssl/evp.h>
#include <openssl/engine.h>
#include "../crypto.h"
static void random_init(void) {
random_fd = open("/dev/urandom", O_RDONLY);
- if(random_fd < 0)
+
+ 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();
close(random_fd);
}
-void randomize(void *out, size_t outlen) {
+void randomize(void *vout, size_t outlen) {
+ uint8_t *out = vout;
+
while(outlen) {
- size_t len = read(random_fd, out, outlen);
+ ssize_t len = read(random_fd, out, outlen);
+
if(len <= 0) {
- if(errno == EAGAIN || errno == EINTR)
+ if(len == -1 && (errno == EAGAIN || errno == EINTR)) {
continue;
+ }
+
fprintf(stderr, "Could not read random numbers: %s\n", strerror(errno));
abort();
}
+
out += len;
outlen -= len;
}
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");
}
void crypto_exit(void) {
- EVP_cleanup();
- ERR_free_strings();
- ENGINE_cleanup();
random_exit();
}