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

Avoid printing duplicate messages from read_rsa_keys

Browse source
This commit is contained in:
Ivo Timmermans 2000-11-30 22:48:48 +00:00
parent 2293304748
commit 28deaeac14
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
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.84 2000/11/30 22:33:16 zarq Exp $ $Id: net.c,v 1.35.4.85 2000/11/30 22:48:48 zarq Exp $
*/ */
#include "config.h" #include "config.h"
@ -59,6 +59,12 @@
# include <err.h> # include <err.h>
#endif #endif
#ifdef HAVE_OPENSSL_PEM_H
# include <openssl/pem.h>
#else
# include <pem.h>
#endif
#ifdef HAVE_TUNTAP #ifdef HAVE_TUNTAP
#include LINUX_IF_TUN_H #include LINUX_IF_TUN_H
#endif #endif
@ -703,7 +709,12 @@ int read_rsa_private_key(RSA **key, const char *file)
return -1; return -1;
} }
if(PEM_read_RSAPrivateKey(fp, key, NULL, NULL) == NULL) if(PEM_read_RSAPrivateKey(fp, key, NULL, NULL) == NULL)
{
syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
cfg->data.ptr);
return -1; return -1;
}
return 0; return 0;
} }
@ -719,13 +730,7 @@ int read_rsa_keys(void)
myself->rsa_key = RSA_new(); myself->rsa_key = RSA_new();
if(read_rsa_private_key(&(myself->rsa_key), cfg->data.ptr) < 0) return read_rsa_private_key(&(myself->rsa_key), cfg->data.ptr);
{
syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
cfg->data.ptr);
return -1;
}
return 0;
} }
/* /*