projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better error checking when reading the RSA private key.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
224a9f9
..
77e52c0
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.3
1 2000/11/20 18:06:17
zarq Exp $
+ $Id: tincd.c,v 1.10.4.3
7 2000/11/29 14:24:40
zarq 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>
@@
-94,11
+100,6
@@
char **g_argv; /* a copy of the cmdline arguments */
char **environment; /* A pointer to the environment on
startup */
char **environment; /* A pointer to the environment on
startup */
-void cleanup_and_exit(int);
-int kill_other(void);
-void make_names(void);
-int write_pidfile(void);
-
static struct option const long_options[] =
{
{ "config", required_argument, NULL, 'c' },
static struct option const long_options[] =
{
{ "config", required_argument, NULL, 'c' },
@@
-216,11
+217,14
@@
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;
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);
@@
-232,11
+236,16
@@
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));
+ if((f = ask_and_safe_open("rsa_key.pub", _("public RSA key"))) == NULL)
+ return -1;
+ PEM_write_RSAPublicKey(f, rsa_key);
+ fclose(f);
- fflush(stdin);
+ if((f = ask_and_safe_open("rsa_key.priv", _("private RSA key"))) == NULL)
+ return -1;
+ PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
+ fclose(f);
+
return 0;
}
return 0;
}
@@
-248,7
+257,7
@@
void make_names(void)
if(netname)
{
if(!pidfilename)
if(netname)
{
if(!pidfilename)
- asprintf(&pidfilename,
"/var
/run/tinc.%s.pid", netname);
+ asprintf(&pidfilename,
LOCALSTATEDIR "
/run/tinc.%s.pid", netname);
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
if(!confbase)
asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
else
@@
-259,7
+268,7
@@
void make_names(void)
else
{
if(!pidfilename)
else
{
if(!pidfilename)
- pidfilename =
"/var
/run/tinc.pid";
+ pidfilename =
LOCALSTATEDIR "
/run/tinc.pid";
if(!confbase)
asprintf(&confbase, "%s/tinc", CONFDIR);
if(!identname)
if(!confbase)
asprintf(&confbase, "%s/tinc", CONFDIR);
if(!identname)