Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index fafba653c4d014f237585d7b704e4e56f642121c..945a740ac22e5abea05d5e00f86168e71e2ae99f 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,8 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
-                  2006      Scott Lamb <slamb@slamb.org>
+    Copyright (C) 2014 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
@@ -60,7 +58,7 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
        if(c->status.encryptout) {
                size_t outlen = length;
 
-               if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
+               if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
                                        c->name, c->hostname);
                        return false;
@@ -171,7 +169,7 @@ bool receive_meta(connection_t *c) {
                } else {
                        size_t outlen = inlen;
 
-                       if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
+                       if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
                                logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
                                           c->name, c->hostname);
                                return false;