Merge branch 'master' into saverio

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 55a7c981d3e7d46ef91e5a6aafe36474d42d8fbe..d25159e6438c2102b4d7747377ed0e3eba7dac01 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,8 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
-                  2008      Max Rijevski <maksuf@gmail.com>
+    Copyright (C) 2000-2013 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -27,7 +25,6 @@
 #include "connection.h"
 #include "list.h"
 #include "logger.h"
-#include "rsa.h"
 #include "utils.h"
 #include "xalloc.h"
 
@@ -54,16 +51,8 @@ void free_connection(connection_t *c) {
        if(!c)
                return;
 
-       cipher_close(c->incipher);
-       digest_close(c->indigest);
-       cipher_close(c->outcipher);
-       digest_close(c->outdigest);
-
        sptps_stop(&c->sptps);
        ecdsa_free(c->ecdsa);
-       rsa_free(c->rsa);
-
-       free(c->hischallenge);
 
        buffer_clear(&c->inbuf);
        buffer_clear(&c->outbuf);