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

Better error checking when reading the RSA private key.

Browse source
This commit is contained in:
Ivo Timmermans 2000-11-30 22:33:16 +00:00
parent bf4e969899
commit 2293304748
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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.83 2000/11/30 20:08:41 zarq Exp $ $Id: net.c,v 1.35.4.84 2000/11/30 22:33:16 zarq Exp $
*/ */
#include "config.h" #include "config.h"
@ -698,11 +698,13 @@ int read_rsa_private_key(RSA **key, const char *file)
if((fp = fopen(file, "r")) == NULL) if((fp = fopen(file, "r")) == NULL)
{ {
syslog(LOG_ERR, _("Error reading file `%s': %m"), syslog(LOG_ERR, _("Error reading RSA key file `%s': %m"),
file); file);
return -1; return -1;
} }
PEM_read_RSAPrivateKey(fp, key, NULL, NULL); if(PEM_read_RSAPrivateKey(fp, key, NULL, NULL) == NULL)
return -1;
return 0;
} }
int read_rsa_keys(void) int read_rsa_keys(void)
@ -716,7 +718,14 @@ int read_rsa_keys(void)
} }
myself->rsa_key = RSA_new(); myself->rsa_key = RSA_new();
return read_rsa_private_key(&(myself->rsa_key), cfg->data.ptr);
if(read_rsa_private_key(&(myself->rsa_key), cfg->data.ptr) < 0)
{
syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
cfg->data.ptr);
return -1;
}
return 0;
} }
/* /*