projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sr.ht CI: add liblz4
[tinc]
/
src
/
nolegacy
/
crypto.c
diff --git
a/src/nolegacy/crypto.c
b/src/nolegacy/crypto.c
index
96e4dda
..
73c4916
100644
(file)
--- a/
src/nolegacy/crypto.c
+++ b/
src/nolegacy/crypto.c
@@
-1,6
+1,6
@@
/*
crypto.c -- Cryptographic miscellaneous functions and initialisation
/*
crypto.c -- Cryptographic miscellaneous functions and initialisation
- Copyright (C) 2007-20
14
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007-20
21
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
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
@@
-19,10
+19,6
@@
#include "../system.h"
#include "../system.h"
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/engine.h>
-
#include "../crypto.h"
#ifndef HAVE_MINGW
#include "../crypto.h"
#ifndef HAVE_MINGW
@@
-31,8
+27,11
@@
static int random_fd = -1;
static void random_init(void) {
random_fd = open("/dev/urandom", O_RDONLY);
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);
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();
if(random_fd < 0) {
fprintf(stderr, "Could not open source of random numbers: %s\n", strerror(errno));
abort();
@@
-43,15
+42,21
@@
static void random_exit(void) {
close(random_fd);
}
close(random_fd);
}
-void randomize(void *out, size_t outlen) {
+void randomize(void *vout, size_t outlen) {
+ char *out = vout;
+
while(outlen) {
while(outlen) {
- size_t len = read(random_fd, out, outlen);
+ ssize_t len = read(random_fd, out, outlen);
+
if(len <= 0) {
if(len <= 0) {
- if(
errno == EAGAIN || errno == EINTR)
+ if(
len == -1 && (errno == EAGAIN || errno == EINTR)) {
continue;
continue;
+ }
+
fprintf(stderr, "Could not read random numbers: %s\n", strerror(errno));
abort();
}
fprintf(stderr, "Could not read random numbers: %s\n", strerror(errno));
abort();
}
+
out += len;
outlen -= len;
}
out += len;
outlen -= len;
}