j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use PEM functions as suggested by OpenSSL docs.

Browse source
This commit is contained in:
Guus Sliepen 2001-11-03 21:21:04 +00:00
parent 8e74c5bee4
commit 8910cbd67e
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.145 2001/10/31 20:22:52 guus Exp $ $Id: net.c,v 1.35.4.146 2001/11/03 21:21:04 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -505,7 +505,6 @@ int read_rsa_public_key(connection_t *c)
FILE *fp; FILE *fp;
char *fname; char *fname;
char *key; char *key;
void *result;
cp cp
if(!c->rsa_key) if(!c->rsa_key)
c->rsa_key = RSA_new(); c->rsa_key = RSA_new();
@ -531,9 +530,9 @@ cp
fname); fname);
return -1; return -1;
} }
result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL); c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
fclose(fp); fclose(fp);
if(!result) if(!c->rsa_key)
{ {
syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %m"), syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %m"),
fname); fname);
@ -547,19 +546,16 @@ cp
/* Else, check if a harnessed public key is in the config file */ /* Else, check if a harnessed public key is in the config file */
result = NULL;
asprintf(&fname, "%s/hosts/%s", confbase, c->name); asprintf(&fname, "%s/hosts/%s", confbase, c->name);
if((fp = fopen(fname, "r"))) if((fp = fopen(fname, "r")))
{ {
result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL); c->rsa_key = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL);
fclose(fp); fclose(fp);
free(fname);
} }
free(fname); free(fname);
if(result) if(c->rsa_key)
return 0; return 0;
else else
{ {
@ -571,14 +567,11 @@ cp
int read_rsa_private_key(void) int read_rsa_private_key(void)
{ {
FILE *fp; FILE *fp;
void *result;
char *fname, *key; char *fname, *key;
cp cp
if(!myself->connection->rsa_key)
myself->connection->rsa_key = RSA_new();
if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key))
{ {
myself->connection->rsa_key = RSA_new();
BN_hex2bn(&myself->connection->rsa_key->d, key); BN_hex2bn(&myself->connection->rsa_key->d, key);
BN_hex2bn(&myself->connection->rsa_key->e, "FFFF"); BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
} }
@ -590,9 +583,9 @@ cp
fname); fname);
return -1; return -1;
} }
result = PEM_read_RSAPrivateKey(fp, &myself->connection->rsa_key, NULL, NULL); myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
fclose(fp); fclose(fp);
if(!result) if(!myself->connection->rsa_key)
{ {
syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"), syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
fname); fname);
@ -853,13 +846,13 @@ cp
c->address = ntohl(ci.sin_addr.s_addr); c->address = ntohl(ci.sin_addr.s_addr);
c->hostname = hostlookup(ci.sin_addr.s_addr); c->hostname = hostlookup(ci.sin_addr.s_addr);
c->port = htons(ci.sin_port); /* This one will be overwritten later */ c->port = htons(ci.sin_port);
c->socket = sfd; c->socket = sfd;
c->last_ping_time = time(NULL); c->last_ping_time = time(NULL);
if(debug_lvl >= DEBUG_CONNECTIONS) if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection from %s port %d"), syslog(LOG_NOTICE, _("Connection from %s port %d"),
c->hostname, htons(ci.sin_port)); c->hostname, c->port);
c->allow_request = ID; c->allow_request = ID;
cp cp