X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=99bbb6db1cf200bca7f940b033e20a6948d4d718;hb=046158a216e78a0412186ec8463157f6bce45d5d;hp=0960ca761c32595b940103091459c0a8ec852090;hpb=8c69f42d7d9b4d9d5f6b6656cfc1bf1e1abee854;p=tinc

diff --git a/src/node.c b/src/node.c
index 0960ca76..99bbb6db 100644
--- a/src/node.c
+++ b/src/node.c
@@ -74,7 +74,6 @@ node_t *new_node(void) {
 	n->subnet_tree = new_subnet_tree();
 	n->edge_tree = new_edge_tree();
 	n->queue = list_alloc((list_action_t) free);
-	EVP_CIPHER_CTX_init(&n->packet_ctx);
 	n->mtu = MTU;
 	n->maxmtu = MTU;
 
@@ -87,9 +86,6 @@ void free_node(node_t *n) {
 	if(n->queue)
 		list_delete_list(n->queue);
 
-	if(n->key)
-		free(n->key);
-
 	if(n->subnet_tree)
 		free_subnet_tree(n->subnet_tree);
 
@@ -98,7 +94,8 @@ void free_node(node_t *n) {
 
 	sockaddrfree(&n->address);
 
-	EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+	cipher_close(&n->cipher);
+	digest_close(&n->digest);
 
 	event_del(&n->mtuevent);
 	
@@ -169,8 +166,8 @@ int dump_nodes(struct evbuffer *out) {
 	for(node = node_tree->head; node; node = node->next) {
 		n = node->data;
 		if(evbuffer_add_printf(out, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)\n"),
-			   n->name, n->hostname, n->cipher ? n->cipher->nid : 0,
-			   n->digest ? n->digest->type : 0, n->maclength, n->compression,
+			   n->name, n->hostname, cipher_get_nid(&n->cipher),
+			   digest_get_nid(&n->digest), n->maclength, n->compression,
 			   n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
 			   n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu) == -1)
 			return errno;