projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the crypto wrappers again instead of calling OpenSSL directly.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
2044310
..
0f78e45
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-31,18
+31,13
@@
#include <sys/mman.h>
#endif
#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 LZO1X_H
#include <getopt.h>
#include "conf.h"
#include "control.h"
+#include "crypto.h"
#include "device.h"
#include "logger.h"
#include "net.h"
#include "device.h"
#include "logger.h"
#include "net.h"
@@
-295,12
+290,7
@@
int main(int argc, char **argv)
/* Slllluuuuuuurrrrp! */
srand(time(NULL));
/* 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;
if(!read_server_config())
return 1;
@@
-353,7
+343,7
@@
end:
exit_control();
#endif
exit_control();
#endif
-
EVP_cleanup
();
-
+
crypto_exit
();
+
return status;
}
return status;
}