projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Finishing touch: encrypt the meta connections
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
7548235
..
ba17b30
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.
19 2000/10/29 09:19:27
guus Exp $
+ $Id: tincd.c,v 1.10.4.
21 2000/10/29 22:55:15
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-33,6
+33,7
@@
#include <signal.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <signal.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
+#include <openssl/err.h>
#include <string.h>
#ifdef HAVE_SYS_IOCTL_H
#include <string.h>
#ifdef HAVE_SYS_IOCTL_H
@@
-204,9
+205,6
@@
int keygen(int bits)
{
RSA *rsa_key;
{
RSA *rsa_key;
- fprintf(stderr, _("Seeding the PRNG: please press some keys or move\nthe mouse if this program seems to have halted...\n"));
- RAND_load_file("/dev/random", 1024); /* OpenSSL PRNG state apparently uses 1024 bytes, but it seems pretty sufficient anyway :) */
-
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
if(!rsa_key)
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
rsa_key = RSA_generate_key(bits, 0xFFFF, indicator, NULL);
if(!rsa_key)
@@
-422,6
+420,10
@@
main(int argc, char **argv, char **envp)
make_names();
make_names();
+ /* Slllluuuuuuurrrrp! */
+
+ RAND_load_file("/dev/urandom", 1024);
+
if(generate_keys)
exit(keygen(generate_keys));
if(generate_keys)
exit(keygen(generate_keys));
@@
-436,10
+438,9
@@
main(int argc, char **argv, char **envp)
if(detach())
exit(0);
if(detach())
exit(0);
-/* FIXME: wt* is this suppose to do?
- if(security_init())
- return 1;
-*/
+ if(debug_lvl >= DEBUG_ERROR)
+ ERR_load_crypto_strings();
+
for(;;)
{
if(!setup_network_connections())
for(;;)
{
if(!setup_network_connections())