projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This subtle pointer arithmetic thingy is (I'm very sure of it) the cause
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
acb156c
..
e279d37
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.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: net_setup.c,v 1.1.2.
28 2003/01/14 12:53
:59 guus Exp $
+ $Id: net_setup.c,v 1.1.2.
32 2003/06/25 20:52
:59 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-85,8
+85,10
@@
int read_rsa_public_key(connection_t *c)
cp();
cp();
- if(!c->rsa_key)
+ if(!c->rsa_key)
{
c->rsa_key = RSA_new();
c->rsa_key = RSA_new();
+// RSA_blinding_on(c->rsa_key, NULL);
+ }
/* First, check for simple PublicKey statement */
/* First, check for simple PublicKey statement */
@@
-132,8
+134,10
@@
int read_rsa_public_key(connection_t *c)
c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
fclose(fp);
c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
fclose(fp);
- if(c->rsa_key)
+ if(c->rsa_key) {
+// RSA_blinding_on(c->rsa_key, NULL);
return 0;
return 0;
+ }
syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
fname, strerror(errno));
syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
fname, strerror(errno));
@@
-166,6
+170,7
@@
int read_rsa_public_key(connection_t *c)
if(fp) {
c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
if(fp) {
c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
+// RSA_blinding_on(c->rsa_key, NULL);
fclose(fp);
}
fclose(fp);
}
@@
-188,6
+193,7
@@
int read_rsa_private_key(void)
if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
myself->connection->rsa_key = RSA_new();
if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
myself->connection->rsa_key = RSA_new();
+// RSA_blinding_on(myself->connection->rsa_key, NULL);
BN_hex2bn(&myself->connection->rsa_key->d, key);
BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
free(key);
BN_hex2bn(&myself->connection->rsa_key->d, key);
BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
free(key);
@@
-362,8
+368,7
@@
int setup_myself(void)
return -1;
}
free(afname);
return -1;
}
free(afname);
- } else
- addressfamily = AF_INET;
+ }
get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
@@
-398,6
+403,9
@@
int setup_myself(void)
keylifetime = 3600;
keyexpires = now + keylifetime;
keylifetime = 3600;
keyexpires = now + keylifetime;
+
+ EVP_CIPHER_CTX_init(&packet_ctx);
+ EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
/* Check if we want to use message authentication codes... */
/* Check if we want to use message authentication codes... */
@@
-440,7
+448,7
@@
int setup_myself(void)
if(get_config_int
(lookup_config(myself->connection->config_tree, "Compression"),
&myself->compression)) {
if(get_config_int
(lookup_config(myself->connection->config_tree, "Compression"),
&myself->compression)) {
- if(myself->compression < 0 || myself->compression >
9
) {
+ if(myself->compression < 0 || myself->compression >
11
) {
syslog(LOG_ERR, _("Bogus compression level!"));
return -1;
}
syslog(LOG_ERR, _("Bogus compression level!"));
return -1;
}