X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=ca71cad9711c416959ac63c3f5f1b8d6ce2391fa;hb=046158a216e78a0412186ec8463157f6bce45d5d;hp=e5cd68950de4eb3d49ac9b2602647f280c9808a1;hpb=465837dd7f7b727d489b354e4b75489dd49fd6e3;p=tinc

diff --git a/src/connection.h b/src/connection.h
index e5cd6895..ca71cad9 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -23,11 +23,10 @@
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
-//#include <openssl/rsa.h>
-#include <openssl/evp.h>
-
 #include <event.h>
 
+#include "cipher.h"
+#include "digest.h"
 #include "rsa.h"
 #include "splay_tree.h"
 
@@ -73,24 +72,18 @@ typedef struct connection_t {
 	struct node_t *node;		/* node associated with the other end */
 	struct edge_t *edge;		/* edge associated with this connection */
 
-	//RSA *rsa_key;				/* his public/private key */
-	struct rsa_key_t rsa_key;          /* his public/private key */
-	const EVP_CIPHER *incipher;	/* Cipher he will use to send data to us */
-	const EVP_CIPHER *outcipher;	/* Cipher we will use to send data to him */
-	EVP_CIPHER_CTX *inctx;		/* Context of encrypted meta data that will come from him to us */
-	EVP_CIPHER_CTX *outctx;		/* Context of encrypted meta data that will be sent from us to him */
-	char *inkey;				/* His symmetric meta key + iv */
-	char *outkey;				/* Our symmetric meta key + iv */
-	int inkeylength;			/* Length of his key + iv */
-	int outkeylength;			/* Length of our key + iv */
-	const EVP_MD *indigest;
-	const EVP_MD *outdigest;
+	rsa_t rsa;			/* his public/private key */
+	cipher_t incipher;		/* Cipher he will use to send data to us */
+	cipher_t outcipher;		/* Cipher we will use to send data to him */
+	digest_t indigest;
+	digest_t outdigest;
+
 	int inmaclength;
 	int outmaclength;
 	int incompression;
 	int outcompression;
-	char *mychallenge;			/* challenge we received from him */
-	char *hischallenge;			/* challenge we sent to him */
+
+	char *hischallenge;		/* The challenge we sent to him */
 
 	struct bufferevent *buffer;			/* buffer events on this metadata connection */
 	struct event inevent;				/* input event on this metadata connection */
@@ -111,7 +104,7 @@ extern connection_t *new_connection(void) __attribute__ ((__malloc__));
 extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
-extern void dump_connections(void);
+extern int dump_connections(struct evbuffer *);
 extern bool read_connection_config(connection_t *);
 
 #endif							/* __TINC_CONNECTION_H__ */