/*
meta.c -- handle the meta communication
- Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
- 2000-2003 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2000-2004 Guus Sliepen <guus@tinc-vpn.org>,
+ 2000-2004 Ivo Timmermans <ivo@tinc-vpn.org>
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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: meta.c,v 1.5 2003/08/24 20:38:24 guus Exp $
+ $Id$
*/
#include "system.h"
+#include <openssl/err.h>
#include <openssl/evp.h>
#include "avl_tree.h"
#include "meta.h"
#include "net.h"
#include "protocol.h"
-#include "system.h"
#include "utils.h"
bool send_meta(connection_t *c, const char *buffer, int length)
c->name, c->hostname);
if(c->status.encryptout) {
- EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
+ result = EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
+ if(!result || outlen != length) {
+ logger(LOG_ERR, _("Error while encrypting metadata to %s (%s): %s"),
+ c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+ return false;
+ }
bufp = outbuf;
length = outlen;
} else
cp();
for(node = connection_tree->head; node; node = node->next) {
- c = (connection_t *) node->data;
+ c = node->data;
if(c != from && c->status.active)
send_meta(c, buffer, length);
bool receive_meta(connection_t *c)
{
- int oldlen, i;
- int lenin, reqlen;
+ int oldlen, i, result;
+ int lenin, lenout, reqlen;
bool decrypted = false;
char inbuf[MAXBUFSIZE];
oldlen = c->buflen;
c->buflen += lenin;
- while(lenin) {
+ while(lenin > 0) {
/* Decrypt */
if(c->status.decryptin && !decrypted) {
- EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
+ result = EVP_DecryptUpdate(c->inctx, inbuf, &lenout, c->buffer + oldlen, lenin);
+ if(!result || lenout != lenin) {
+ logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
+ c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+ return false;
+ }
memcpy(c->buffer + oldlen, inbuf, lenin);
decrypted = true;
}
receive_tcppacket(c, c->buffer, c->tcplen);
c->buflen -= c->tcplen;
- lenin -= c->tcplen;
+ lenin -= c->tcplen - oldlen;
memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
oldlen = 0;
c->tcplen = 0;
return false;
c->buflen -= reqlen;
- lenin -= reqlen;
+ lenin -= reqlen - oldlen;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
oldlen = 0;
continue;