projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Require OpenSSL 1.1.0 or later.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
8c43b39
..
501fecd
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-27,6
+27,7
@@
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/evp.h>
+#include <openssl/bn.h>
#include "avl_tree.h"
#include "conf.h"
#include "avl_tree.h"
#include "conf.h"
@@
-48,18
+49,6
@@
char *myport;
devops_t devops;
char *myport;
devops_t devops;
-#ifndef HAVE_RSA_SET0_KEY
-int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
- BN_free(r->n);
- r->n = n;
- BN_free(r->e);
- r->e = e;
- BN_free(r->d);
- r->d = d;
- return 1;
-}
-#endif
-
bool read_rsa_public_key(connection_t *c) {
FILE *fp;
char *pubname;
bool read_rsa_public_key(connection_t *c) {
FILE *fp;
char *pubname;
@@
-239,7
+228,7
@@
static bool read_rsa_private_key(void) {
return false;
}
return false;
}
-#if !defined(HAVE_MINGW) && !defined(HAVE_
__CYGWIN32__
)
+#if !defined(HAVE_MINGW) && !defined(HAVE_
CYGWIN
)
struct stat s;
if(!fstat(fileno(fp), &s)) {
struct stat s;
if(!fstat(fileno(fp), &s)) {
@@
-860,7
+849,7
@@
static bool setup_myself(void) {
#ifdef HAVE_MINGW
Sleep(1000);
#endif
#ifdef HAVE_MINGW
Sleep(1000);
#endif
-#ifdef HAVE_
__CYGWIN32__
+#ifdef HAVE_
CYGWIN
sleep(1);
#endif
execute_script("tinc-up", envp);
sleep(1);
#endif
execute_script("tinc-up", envp);