projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Changed license of AVL tree library to GPL.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
18791cc
..
3e02e69
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.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.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: tincd.c,v 1.10.4.
34 2000/11/22 19:14:09
guus Exp $
+ $Id: tincd.c,v 1.10.4.
40 2001/01/06 18:03:41
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-56,6
+56,12
@@
# include <err.h>
#endif
# include <err.h>
#endif
+#ifdef HAVE_OPENSSL_PEM_H
+# include <openssl/pem.h>
+#else
+# include <pem.h>
+#endif
+
#include <utils.h>
#include <utils.h>
@@
-147,7
+153,10
@@
parse_options(int argc, char **argv, char **envp)
do_detach = 0;
break;
case 'd': /* inc debug level */
do_detach = 0;
break;
case 'd': /* inc debug level */
- debug_lvl++;
+ if(optarg)
+ debug_lvl = atoi(optarg);
+ else
+ debug_lvl++;
break;
case 'k': /* kill old tincds */
kill_tincd = 1;
break;
case 'k': /* kill old tincds */
kill_tincd = 1;
@@
-162,7
+171,8
@@
parse_options(int argc, char **argv, char **envp)
generate_keys = atoi(optarg);
if(generate_keys < 512)
{
generate_keys = atoi(optarg);
if(generate_keys < 512)
{
- fprintf(stderr, _("Invalid argument! BITS must be a number equal to or greater than 512.\n"));
+ fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"),
+ optarg);
usage(1);
}
generate_keys &= ~7; /* Round it to bytes */
usage(1);
}
generate_keys &= ~7; /* Round it to bytes */
@@
-211,14
+221,19
@@
void indicator(int a, int b, void *p)
}
}
}
}
-/* Generate a public/private RSA keypair, and possibly store it into the configuration file. */
-
+/*
+ Generate a public/private RSA keypair, and ask for a file to store
+ them in.
+*/
int keygen(int bits)
{
RSA *rsa_key;
int keygen(int bits)
{
RSA *rsa_key;
+ FILE *f;
+ char *filename;
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
+
if(!rsa_key)
{
fprintf(stderr, _("Error during key generation!"));
if(!rsa_key)
{
fprintf(stderr, _("Error during key generation!"));
@@
-227,11
+242,20
@@
int keygen(int bits)
else
fprintf(stderr, _("Done.\n"));
else
fprintf(stderr, _("Done.\n"));
- fprintf(stderr, _("Please copy the private key to tinc.conf and the\npublic key to your host configuration file:\n\n"));
- printf("PublicKey = %s\n", BN_bn2hex(rsa_key->n));
- printf("PrivateKey = %s\n", BN_bn2hex(rsa_key->d));
+ asprintf(&filename, "%s/rsa_key.pub", confbase);
+ if((f = ask_and_safe_open(filename, _("public RSA key"))) == NULL)
+ return -1;
+ PEM_write_RSAPublicKey(f, rsa_key);
+ fclose(f);
+ free(filename);
- fflush(stdin);
+ asprintf(&filename, "%s/rsa_key.priv", confbase);
+ if((f = ask_and_safe_open(filename, _("private RSA key"))) == NULL)
+ return -1;
+ PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
+ fclose(f);
+ free(filename);
+
return 0;
}
return 0;
}
@@
-247,7
+271,7
@@
void make_names(void)
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
-
fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n
"));
+
syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter...
"));
if(!identname)
asprintf(&identname, "tinc.%s", netname);
}
if(!identname)
asprintf(&identname, "tinc.%s", netname);
}
@@
-295,18
+319,20
@@
main(int argc, char **argv, char **envp)
if(geteuid())
{
if(geteuid())
{
- fprintf(stderr, _("You must be root to run this program.
Sorry.
\n"));
+ fprintf(stderr, _("You must be root to run this program.\n"));
return 1;
}
return 1;
}
+ openlog("tinc", LOG_PERROR, LOG_DAEMON); /* Catch all syslog() calls issued before detaching */
+
g_argv = argv;
make_names();
/* Slllluuuuuuurrrrp! */
g_argv = argv;
make_names();
/* Slllluuuuuuurrrrp! */
-
+cp
RAND_load_file("/dev/urandom", 1024);
RAND_load_file("/dev/urandom", 1024);
-
+cp
if(generate_keys)
exit(keygen(generate_keys));
if(generate_keys)
exit(keygen(generate_keys));
@@
-315,12
+341,10
@@
main(int argc, char **argv, char **envp)
if(read_server_config())
return 1;
if(read_server_config())
return 1;
-
- init_processes();
-
+cp
if(detach())
exit(0);
if(detach())
exit(0);
-
+cp
if(debug_lvl >= DEBUG_ERROR)
ERR_load_crypto_strings();
if(debug_lvl >= DEBUG_ERROR)
ERR_load_crypto_strings();