projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't call OPENSSL_cleanup().
[tinc]
/
src
/
openssl
/
crypto.c
diff --git
a/src/openssl/crypto.c
b/src/openssl/crypto.c
index
e594e73
..
bf9fe08
100644
(file)
--- a/
src/openssl/crypto.c
+++ b/
src/openssl/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
@@
-20,7
+20,6
@@
#include "../system.h"
#include <openssl/rand.h>
#include "../system.h"
#include <openssl/rand.h>
-#include <openssl/evp.h>
#include <openssl/engine.h>
#include "../crypto.h"
#include <openssl/engine.h>
#include "../crypto.h"
@@
-50,10
+49,10
@@
void randomize(void *vout, size_t outlen) {
char *out = vout;
while(outlen) {
char *out = vout;
while(outlen) {
- size_t len = read(random_fd, out, outlen);
+ s
s
ize_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;
}
@@
-95,10
+94,6
@@
void crypto_init(void) {
random_init();
ENGINE_load_builtin_engines();
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");
if(!RAND_status()) {
fprintf(stderr, "Not enough entropy for the PRNG!\n");
@@
-107,8
+102,5
@@
void crypto_init(void) {
}
void crypto_exit(void) {
}
void crypto_exit(void) {
- EVP_cleanup();
- ERR_free_strings();
- ENGINE_cleanup();
random_exit();
}
random_exit();
}