projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support RSA_PUBKEYs (as opposed to RSAPublicKeys) so tinc accepts
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
b5dc727
..
ec0700c
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net_setup.c,v 1.1.2.1
4 2002/04/01 21:28:39
guus Exp $
+ $Id: net_setup.c,v 1.1.2.1
6 2002/06/02 16:06:33
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-107,13
+107,26
@@
cp
free(fname);
c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
fclose(fp);
free(fname);
c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
fclose(fp);
- if(!c->rsa_key)
+ if(c->rsa_key)
+ return 0; /* Woohoo. */
+
+ /* If it fails, try PEM_read_RSA_PUBKEY. */
+ if((fp = fopen(fname, "r")) == NULL)
{
{
- syslog(LOG_ERR, _("
Reading RSA public key file `%s' failed
: %s"),
+ syslog(LOG_ERR, _("
Error reading RSA public key file `%s'
: %s"),
fname, strerror(errno));
fname, strerror(errno));
+ free(fname);
return -1;
}
return -1;
}
- return 0;
+ free(fname);
+ c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
+ fclose(fp);
+ if(c->rsa_key)
+ return 0;
+
+ syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
+ fname, strerror(errno));
+ return -1;
}
else
{
}
else
{
@@
-135,11
+148,23
@@
cp
if(c->rsa_key)
return 0;
if(c->rsa_key)
return 0;
- else
+
+ /* Try again with PEM_read_RSA_PUBKEY. */
+
+ asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ if((fp = fopen(fname, "r")))
{
{
-
syslog(LOG_ERR, _("No public key for %s specified!"), c->name
);
-
return -1
;
+
c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL
);
+
fclose(fp)
;
}
}
+
+ free(fname);
+
+ if(c->rsa_key)
+ return 0;
+
+ syslog(LOG_ERR, _("No public key for %s specified!"), c->name);
+ return -1;
}
int read_rsa_private_key(void)
}
int read_rsa_private_key(void)
@@
-192,6
+217,7
@@
int setup_myself(void)
config_t *cfg;
subnet_t *subnet;
char *name, *hostname, *mode, *afname, *cipher, *digest;
config_t *cfg;
subnet_t *subnet;
char *name, *hostname, *mode, *afname, *cipher, *digest;
+ char *address = NULL;
struct addrinfo hint, *ai, *aip;
int choice, err;
cp
struct addrinfo hint, *ai, *aip;
int choice, err;
cp
@@
-440,12
+466,14
@@
cp
memset(&hint, 0, sizeof(hint));
memset(&hint, 0, sizeof(hint));
+ get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
+
hint.ai_family = addressfamily;
hint.ai_socktype = SOCK_STREAM;
hint.ai_protocol = IPPROTO_TCP;
hint.ai_flags = AI_PASSIVE;
hint.ai_family = addressfamily;
hint.ai_socktype = SOCK_STREAM;
hint.ai_protocol = IPPROTO_TCP;
hint.ai_flags = AI_PASSIVE;
- if((err = getaddrinfo(
NULL
, myport, &hint, &ai)) || !ai)
+ if((err = getaddrinfo(
address
, myport, &hint, &ai)) || !ai)
{
syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
return -1;
{
syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
return -1;