X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=14a951ffee48f69e66dd3cd5ddd69e7e62db9239;hp=3dd997428e50d7f0f8751eb5e97bcdff6770088f;hb=28deaeac14d619efb9830d03fd61dc7cca70a701;hpb=09260b43d1ff037c22f86c82a6af830e9a6d6ae5

diff --git a/src/net.c b/src/net.c
index 3dd99742..14a951ff 100644
--- a/src/net.c
+++ b/src/net.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.
 
-    $Id: net.c,v 1.35.4.83 2000/11/30 20:08:41 zarq Exp $
+    $Id: net.c,v 1.35.4.85 2000/11/30 22:48:48 zarq Exp $
 */
 
 #include "config.h"
@@ -59,6 +59,12 @@
 # include <err.h>
 #endif
 
+#ifdef HAVE_OPENSSL_PEM_H
+# include <openssl/pem.h>
+#else
+# include <pem.h>
+#endif
+
 #ifdef HAVE_TUNTAP
 #include LINUX_IF_TUN_H
 #endif
@@ -698,11 +704,18 @@ int read_rsa_private_key(RSA **key, const char *file)
 
   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);
       return -1;
     }
-  PEM_read_RSAPrivateKey(fp, key, 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 0;
 }
 
 int read_rsa_keys(void)
@@ -716,6 +729,7 @@ int read_rsa_keys(void)
     }
 
   myself->rsa_key = RSA_new();
+
   return read_rsa_private_key(&(myself->rsa_key), cfg->data.ptr);
 }