projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only accept an ADD_HOST request for a host that already exists in our conn_list if...
[tinc]
/
src
/
encr.c
diff --git
a/src/encr.c
b/src/encr.c
index
fe7b2e8
..
cae34c4
100644
(file)
--- a/
src/encr.c
+++ b/
src/encr.c
@@
-1,6
+1,6
@@
/*
encr.c -- everything that deals with encryption
/*
encr.c -- everything that deals with encryption
- Copyright (C) 1998,
99
Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998,
1999,2000
Ivo Timmermans <zarq@iname.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-19,6
+19,8
@@
#include "config.h"
#include "config.h"
+#include <sys/types.h>
+
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@
-45,6
+47,8
@@
#include "net.h"
#include "protocol.h"
#include "net.h"
#include "protocol.h"
+#include "system.h"
+
#define ENCR_GENERATOR "0xd"
#define ENCR_PRIME "0x7fffffffffffffffffffffffffffffff" /* Mersenne :) */
#define ENCR_GENERATOR "0xd"
#define ENCR_PRIME "0x7fffffffffffffffffffffffffffffff" /* Mersenne :) */
@@
-102,14
+106,14
@@
cp
if((f = fopen(filename, "rb")) == NULL)
{
if((f = fopen(filename, "rb")) == NULL)
{
- syslog(LOG_ERR,
"Could not open %s: %m"
, filename);
+ syslog(LOG_ERR,
_("Could not open %s: %m")
, filename);
return -1;
}
fscanf(f, "%d ", &size);
if(size < 1 || size > (1<<15))
{
return -1;
}
fscanf(f, "%d ", &size);
if(size < 1 || size > (1<<15))
{
- syslog(LOG_ERR,
"Illegal passphrase in %s; size would be %d"
, filename, size);
+ syslog(LOG_ERR,
_("Illegal passphrase in %s; size would be %d")
, filename, size);
return -1;
}
size >>= 2; /* bits->nibbles */
return -1;
}
size >>= 2; /* bits->nibbles */
@@
-143,11
+147,11
@@
cp
else
my_key_expiry = (time_t)(time(NULL) + cfg->data.val);
else
my_key_expiry = (time_t)(time(NULL) + cfg->data.val);
- syslog(LOG_NOTICE,
"Generating %d bits keys."
, PRIVATE_KEY_BITS);
+ syslog(LOG_NOTICE,
_("Generating %d bits keys.")
, PRIVATE_KEY_BITS);
if((f = fopen("/dev/urandom", "r")) == NULL)
{
if((f = fopen("/dev/urandom", "r")) == NULL)
{
- syslog(LOG_ERR,
"Opening /dev/urandom failed: %m"
);
+ syslog(LOG_ERR,
_("Opening /dev/urandom failed: %m")
);
return -1;
}
return -1;
}
@@
-212,7
+216,7
@@
cp
encryption_keylen = len;
if(debug_lvl > 2)
encryption_keylen = len;
if(debug_lvl > 2)
- syslog(LOG_INFO,
"Encryption key set to %s"
, tmp);
+ syslog(LOG_INFO,
_("Encryption key set to %s")
, tmp);
free(tmp);
mpz_clear(ak);
free(tmp);
mpz_clear(ak);
@@
-343,7
+347,7
@@
void regenerate_keys(void)
cp
generate_private_key();
calculate_public_key();
cp
generate_private_key();
calculate_public_key();
- send_key_changed
2
();
+ send_key_changed
_all
();
recalculate_encryption_keys();
cp
}
recalculate_encryption_keys();
cp
}