X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnet.c;h=d89c7c6f0c51de45cf032611849654129604c1e9;hp=893892c033bedbb453453829ddd384a853ac45ed;hb=a0f7af3ed79c55d9680cbb0a569b3c8987581d43;hpb=1eedf54681d4556c6874f7baee8e810cab867756

diff --git a/src/net.c b/src/net.c
index 893892c..d89c7c6 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.82 2000/11/25 13:33:30 guus Exp $
+    $Id: net.c,v 1.35.4.86 2000/11/30 23:18:19 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
@@ -692,6 +698,61 @@ cp
   return 0;
 }
 
+int read_rsa_public_key(RSA **key, const char *file)
+{
+  FILE *fp;
+
+  if((fp = fopen(file, "r")) == NULL)
+    {
+      syslog(LOG_ERR, _("Error reading RSA public key file `%s': %m"),
+	     file);
+      return -1;
+    }
+  if(PEM_read_RSAPublicKey(fp, key, NULL, NULL) == NULL)
+    {
+      syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
+	     file);
+      return -1;
+    }
+
+  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 RSA private key file `%s': %m"),
+	     file);
+      return -1;
+    }
+  if(PEM_read_RSAPrivateKey(fp, key, NULL, NULL) == NULL)
+    {
+      syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
+	     file);
+      return -1;
+    }
+
+  return 0;
+}
+
+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)
 */
@@ -721,17 +782,8 @@ cp
       return -1;
     }
 cp
-  if(!(cfg = get_config_val(config, config_privatekey)))
-    {
-      syslog(LOG_ERR, _("Private key for tinc daemon required!"));
-      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_rsa_keys())
+    return -1;
 
   if(read_host_config(myself))
     {
@@ -739,15 +791,7 @@ cp
       return -1;
     }
 cp  
-  if(!(cfg = get_config_val(myself->config, config_publickey)))
-    {
-      syslog(LOG_ERR, _("Public key for tinc daemon required!"));
-      return -1;
-    }
-  else
-    {
-      BN_hex2bn(&myself->rsa_key->n, cfg->data.ptr);
-    }
+
 /*
   if(RSA_check_key(myself->rsa_key) != 1)
     {