projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor crypto RNG; add getrandom() support
[tinc]
/
src
/
sptps_test.c
diff --git
a/src/sptps_test.c
b/src/sptps_test.c
index
50057e2
..
249f2e4
100644
(file)
--- a/
src/sptps_test.c
+++ b/
src/sptps_test.c
@@
-30,6
+30,7
@@
#include "sptps.h"
#include "utils.h"
#include "names.h"
#include "sptps.h"
#include "utils.h"
#include "names.h"
+#include "random.h"
#ifndef HAVE_WINDOWS
#define closesocket(s) close(s)
#ifndef HAVE_WINDOWS
#define closesocket(s) close(s)
@@
-314,7
+315,7
@@
static void print_listening_msg(int sock) {
fflush(stderr);
}
fflush(stderr);
}
-
int main
(int argc, char *argv[]) {
+
static int run_test
(int argc, char *argv[]) {
program_name = argv[0];
bool initiator = false;
bool datagram = false;
program_name = argv[0];
bool initiator = false;
bool datagram = false;
@@
-523,9
+524,6
@@
int main(int argc, char *argv[]) {
fprintf(stderr, "Connected\n");
}
fprintf(stderr, "Connected\n");
}
- crypto_init();
- prng_init();
-
FILE *fp = fopen(argv[1], "r");
if(!fp) {
FILE *fp = fopen(argv[1], "r");
if(!fp) {
@@
-709,12
+707,19
@@
int main(int argc, char *argv[]) {
free(mykey);
free(hiskey);
free(mykey);
free(hiskey);
+ closesocket(sock);
- if(!stopped) {
- return 1;
- }
+ return !stopped;
+}
- closesocket(sock);
+int main(int argc, char *argv[]) {
+ random_init();
+ crypto_init();
+ prng_init();
- return 0;
+ int result = run_test(argc, argv);
+
+ random_exit();
+
+ return result;
}
}