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

Read the PEM file pointed to by the configuration directive

Browse source 
PrivateKey.  This means thatt he meaning of this variable has changed,
it no longer should contain the private key directly.

WARNING: This code is untested.
This commit is contained in:
Ivo Timmermans 2000-11-30 20:08:41 +00:00
parent 8ccb1ede92
commit 09260b43d1
1 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
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.82 2000/11/25 13:33:30 guus Exp $ $Id: net.c,v 1.35.4.83 2000/11/30 20:08:41 zarq Exp $
*/ */
#include "config.h" #include "config.h"
@ -692,6 +692,33 @@ cp
return 0; return 0;
} }
int read_rsa_private_key(RSA **key, const char *file)
{
FILE *fp;
if((fp = fopen(file, "r")) == NULL)
{
syslog(LOG_ERR, _("Error reading file `%s': %m"),
file);
return -1;
}
PEM_read_RSAPrivateKey(fp, key, NULL, NULL);
}
int read_rsa_keys(void)
{
config_t const *cfg;
if(!(cfg = get_config_val(config, config_privatekey)))
{
syslog(LOG_ERR, _("Private key for tinc daemon required!"));
return -1;
}
myself->rsa_key = RSA_new();
return read_rsa_private_key(&(myself->rsa_key), cfg->data.ptr);
}
/* /*
Configure connection_t myself and set up the local sockets (listen only) Configure connection_t myself and set up the local sockets (listen only)
*/ */
@ -721,17 +748,8 @@ cp
return -1; return -1;
} }
cp cp
if(!(cfg = get_config_val(config, config_privatekey))) if(read_rsa_keys())
{
syslog(LOG_ERR, _("Private key for tinc daemon required!"));
return -1; return -1;
}
else
{
myself->rsa_key = RSA_new();
BN_hex2bn(&myself->rsa_key->d, cfg->data.ptr);
BN_hex2bn(&myself->rsa_key->e, "FFFF");
}
if(read_host_config(myself)) if(read_host_config(myself))
{ {