Use the crypto wrappers again instead of calling OpenSSL directly.
This theoretically allows other cryptographic libraries to be used, and it improves the readability of the code.
This commit is contained in:
parent
8c69f42d7d
commit
046158a216
10 changed files with 239 additions and 527 deletions
18
src/tincd.c
18
src/tincd.c
|
|
@ -31,18 +31,13 @@
|
|||
#include <sys/mman.h>
|
||||
#endif
|
||||
|
||||
#include <openssl/rand.h>
|
||||
#include <openssl/rsa.h>
|
||||
#include <openssl/pem.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/engine.h>
|
||||
|
||||
#include LZO1X_H
|
||||
|
||||
#include <getopt.h>
|
||||
|
||||
#include "conf.h"
|
||||
#include "control.h"
|
||||
#include "crypto.h"
|
||||
#include "device.h"
|
||||
#include "logger.h"
|
||||
#include "net.h"
|
||||
|
|
@ -295,12 +290,7 @@ int main(int argc, char **argv)
|
|||
/* Slllluuuuuuurrrrp! */
|
||||
|
||||
srand(time(NULL));
|
||||
RAND_load_file("/dev/urandom", 1024);
|
||||
|
||||
ENGINE_load_builtin_engines();
|
||||
ENGINE_register_all_complete();
|
||||
|
||||
OpenSSL_add_all_algorithms();
|
||||
crypto_init();
|
||||
|
||||
if(!read_server_config())
|
||||
return 1;
|
||||
|
|
@ -353,7 +343,7 @@ end:
|
|||
exit_control();
|
||||
#endif
|
||||
|
||||
EVP_cleanup();
|
||||
|
||||
crypto_exit();
|
||||
|
||||
return status;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue