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.84 2000/11/30 22:33:16 zarq Exp $
+ $Id: net.c,v 1.35.4.87 2000/12/05 08:59:29 zarq Exp $
*/
#include "config.h"
# 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
const char *tapfname;
config_t const *cfg;
#ifdef HAVE_LINUX
- #ifdef HAVE_TUNTAP
+# ifdef HAVE_TUNTAP
struct ifreq ifr;
- #endif
+# endif
#endif
cp
else
{
#ifdef HAVE_LINUX
- #ifdef HAVE_TUNTAP
+# ifdef HAVE_TUNTAP
tapfname = "/dev/misc/net/tun";
- #else
+# else
tapfname = "/dev/tap0";
- #endif
+# endif
#endif
#ifdef HAVE_FREEBSD
tapfname = "/dev/tap0";
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 key file `%s': %m"),
+ syslog(LOG_ERR, _("Error reading RSA private key file `%s': %m"),
file);
return -1;
}
if(PEM_read_RSAPrivateKey(fp, key, NULL, NULL) == NULL)
- return -1;
+ {
+ syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
+ file);
+ return -1;
+ }
+
return 0;
}
myself->rsa_key = RSA_new();
- 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;
+ return read_rsa_private_key(&(myself->rsa_key), cfg->data.ptr);
}
/*
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)
{