X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=44d0c7443e885c97ffa73779a6fe3dc30938bf92;hp=acb156cc4c0d404a764b7e077b09eedd06b2eeab;hb=c70f52087bf6f7514684bbc859b83aec2ca17ae4;hpb=38f562fdfcacb50d34b9a48bfaea7faa132f493a

diff --git a/src/net_setup.c b/src/net_setup.c
index acb156cc..44d0c744 100644
--- 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.
 
-    $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.31 2003/05/06 21:13:17 guus Exp $
 */
 
 #include "config.h"
@@ -85,8 +85,10 @@ int read_rsa_public_key(connection_t *c)
 
 	cp();
 
-	if(!c->rsa_key)
+	if(!c->rsa_key) {
 		c->rsa_key = RSA_new();
+//		RSA_blinding_on(c->rsa_key, NULL);
+	}
 
 	/* 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);
 
-			if(c->rsa_key)
+			if(c->rsa_key) {
+//				RSA_blinding_on(c->rsa_key, NULL);
 				return 0;
+			}
 
 			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);
+//		RSA_blinding_on(c->rsa_key, NULL);
 		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();
+//		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);
@@ -398,6 +404,9 @@ int setup_myself(void)
 		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... */
 
@@ -440,7 +449,7 @@ int setup_myself(void)
 	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;
 		}